diff --git a/.gitignore b/.gitignore
index aa73ebb11..ce36a8619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ scripts/keycloak/data/*
 # ignore clowder chart deps
 deployments/kubernetes/charts/clowder2/charts
 deployments/kubernetes/charts/clowder2/*clowder2-software-dev.yaml
+*secret*.yaml
 
 # Environments
 .env
diff --git a/.run/uvicorn.run.xml b/.run/uvicorn.run.xml
index 673201082..585d51f88 100644
--- a/.run/uvicorn.run.xml
+++ b/.run/uvicorn.run.xml
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="uvicorn" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
     <module name="clowder2" />
-    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
@@ -14,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="uvicorn" />
-    <option name="PARAMETERS" value="app.main:app --reload --host 0.0.0.0" />
+    <option name="PARAMETERS" value="app.main:app --host 0.0.0.0 --workers 17" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="true" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a2d26d27..90a2ab48c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v2.0.0-beta.3] - 2024-07-29
+
+### Added
+
+- License management
+- Release dataset with versions
+- Enable and disable user account through Keycloak
+- Jupyterhub integration
+- Interface for creating and editing matching criteria for triggering extractors
+- Interface for editing metadata definitions
+- My dataset tab listing all the datasets created by the user
+- Drag and drop upload multiple files
+- Footer with links to documentation, source code, and contact information
+- Documentation through MKDocs
+
+### Changed
+
+- Allow public datasets and files to be searchable
+- List all the extractors with the ability to enable/disable the extractors
+- Filter listeners based on their support for file or dataset
+- Helm chart updated to support custom existing secret
+
+### Fixed
+
+- Clowder registration link on the top bar
+- Case-insensitive search
+- Download count immediately increments after download
+
 ## [v2.0.0-beta.2] - 2024-02-16
 
 ### Added
diff --git a/backend/Dockerfile b/backend/Dockerfile
index a0952e466..afee972ed 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -22,4 +22,5 @@ ENV PATH="/code/.venv/bin:$PATH"
 COPY ./app /code/app
 
 # launch app using uvicorn
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "80"]
+# Number of recommended workers is 2 x number_of_cores +1
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "80", "--workers", "17"]
diff --git a/backend/app/config.py b/backend/app/config.py
index 2f3041853..ae88e43d3 100644
--- a/backend/app/config.py
+++ b/backend/app/config.py
@@ -9,7 +9,7 @@ class Settings(BaseSettings):
     API_V2_STR: str = "/api/v2"
     admin_email: str = "devnull@ncsa.illinois.edu"
     frontend_url: str = "http://localhost:3000"
-    version: str = "2.0.0-beta.2"
+    version: str = "2.0.0-beta.3"
 
     # Unique secret for hashing API keys. Generate with `openssl rand -hex 32`
     local_auth_secret = "clowder_secret_key"
diff --git a/backend/app/keycloak_auth.py b/backend/app/keycloak_auth.py
index 7139f5ce6..062424890 100644
--- a/backend/app/keycloak_auth.py
+++ b/backend/app/keycloak_auth.py
@@ -2,6 +2,7 @@
 import json
 import logging
 from datetime import datetime
+from typing import Optional
 
 from fastapi import Depends, HTTPException, Security
 from fastapi.security import APIKeyCookie, APIKeyHeader, OAuth2AuthorizationCodeBearer
@@ -435,6 +436,43 @@ async def create_user(email: str, password: str, firstName: str, lastName: str):
     return user
 
 
+async def update_user(
+    email: str,
+    new_email: Optional[str],
+    new_password: Optional[str],
+    new_firstName: Optional[str],
+    new_lastName: Optional[str],
+):
+    """Update existing user in Keycloak."""
+    keycloak_admin = KeycloakAdmin(
+        server_url=settings.auth_server_url,
+        username=settings.keycloak_username,
+        password=settings.keycloak_password,
+        realm_name=settings.keycloak_realm_name,
+        user_realm_name=settings.keycloak_user_realm_name,
+        # client_secret_key=settings.auth_client_secret,
+        # client_id=settings.keycloak_client_id,
+        verify=True,
+    )
+    existing_user_id = keycloak_admin.get_user_id(email)
+    existing_user = keycloak_admin.get_user(existing_user_id)
+    # Update user and set password
+    keycloak_admin.update_user(
+        existing_user_id,
+        {
+            "email": new_email or existing_user["email"],
+            "username": new_email or existing_user["email"],
+            "firstName": new_firstName or existing_user["firstName"],
+            "lastName": new_lastName or existing_user["lastName"],
+        },
+    )
+    if new_password:
+        keycloak_admin.set_user_password(existing_user_id, new_password, False)
+
+    updated_user = keycloak_admin.get_user(existing_user_id)
+    return updated_user
+
+
 def delete_user(email: str):
     """Create a user in Keycloak."""
     keycloak_admin = KeycloakAdmin(
diff --git a/backend/app/main.py b/backend/app/main.py
index 84f54d38b..341c7ef2e 100644
--- a/backend/app/main.py
+++ b/backend/app/main.py
@@ -86,7 +86,7 @@
     description="A cloud native data management framework to support any research domain. Clowder was "
     "developed to help researchers and scientists in data intensive domains manage raw data, complex "
     "metadata, and automatic data pipelines. ",
-    version="2.0.0-beta.2",
+    version="2.0.0-beta.3",
     contact={"name": "Clowder", "url": "https://clowderframework.org/"},
     license_info={
         "name": "Apache 2.0",
@@ -316,7 +316,9 @@ async def startup_beanie():
             ThumbnailDBViewList,
             LicenseDB,
         ],
-        recreate_views=True,
+        # If view exists, will not recreate
+        # When view query changes, make sure to manually drop view and recreate
+        recreate_views=False,
     )
 
 
diff --git a/backend/app/models/metadata.py b/backend/app/models/metadata.py
index 8d81c6311..a7d73885f 100644
--- a/backend/app/models/metadata.py
+++ b/backend/app/models/metadata.py
@@ -307,9 +307,11 @@ async def validate_context(
             detail="Context is required",
         )
     if context is not None:
-        pass
+        # TODO validate context
+        return content
     if context_url is not None:
-        pass
+        # TODO validate context
+        return content
     if definition is not None:
         if (
             md_def := await MetadataDefinitionDB.find_one(
@@ -322,7 +324,7 @@ async def validate_context(
                 status_code=400,
                 detail=f"{definition} is not valid metadata definition",
             )
-    return content
+        return content
 
 
 def deep_update(orig: dict, new: dict):
diff --git a/backend/app/models/users.py b/backend/app/models/users.py
index e7055dbcf..52d1783a0 100644
--- a/backend/app/models/users.py
+++ b/backend/app/models/users.py
@@ -18,6 +18,12 @@ class UserIn(UserBase):
     password: str
 
 
+class UserUpdate(BaseModel):
+    first_name: Optional[str]
+    last_name: Optional[str]
+    password: Optional[str]
+
+
 class UserLogin(BaseModel):
     email: EmailStr
     password: str
diff --git a/backend/app/routers/authentication.py b/backend/app/routers/authentication.py
index ef768c56e..7da6866b9 100644
--- a/backend/app/routers/authentication.py
+++ b/backend/app/routers/authentication.py
@@ -5,15 +5,18 @@
     enable_disable_user,
     get_current_user,
     keycloak_openid,
+    update_user,
 )
 from app.models.datasets import DatasetDBViewList
-from app.models.users import UserDB, UserIn, UserLogin, UserOut
+from app.models.users import UserDB, UserIn, UserLogin, UserOut, UserUpdate
+from app.routers.utils import save_refresh_token
 from beanie import PydanticObjectId
 from fastapi import APIRouter, Depends, HTTPException
 from keycloak.exceptions import (
     KeycloakAuthenticationError,
     KeycloakGetError,
     KeycloakPostError,
+    KeycloakPutError,
 )
 from passlib.hash import bcrypt
 
@@ -69,6 +72,7 @@ async def save_user(userIn: UserIn):
 async def login(userIn: UserLogin):
     try:
         token = keycloak_openid.token(userIn.email, userIn.password)
+        await save_refresh_token(token["refresh_token"], userIn.email)
         return {"token": token["access_token"]}
     # bad credentials
     except KeycloakAuthenticationError as e:
@@ -95,6 +99,45 @@ async def authenticate_user(email: str, password: str):
     return user
 
 
+@router.patch("/users/me", response_model=UserOut)
+async def update_current_user(
+    userUpdate: UserUpdate, current_user=Depends(get_current_user)
+):
+    try:
+        await update_user(
+            current_user.email,
+            None,
+            userUpdate.password,
+            userUpdate.first_name,
+            userUpdate.last_name,
+        )
+    except KeycloakGetError as e:
+        raise HTTPException(
+            status_code=e.response_code,
+            detail=json.loads(e.error_message),
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    except KeycloakPutError as e:
+        raise HTTPException(
+            status_code=e.response_code,
+            detail=json.loads(e.error_message),
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+
+    # Update local user
+    user = await UserDB.find_one(UserDB.email == current_user.email)
+
+    if userUpdate.first_name:
+        user.first_name = userUpdate.first_name
+    if userUpdate.last_name:
+        user.last_name = userUpdate.last_name
+    if userUpdate.password:
+        user.hashed_password = bcrypt.hash(userUpdate.password)
+
+    await user.save()
+    return user.dict()
+
+
 @router.get("/users/me/is_admin", response_model=bool)
 async def get_admin(
     dataset_id: str = None, current_username=Depends(get_current_user)
diff --git a/backend/app/routers/datasets.py b/backend/app/routers/datasets.py
index d605cfb12..ae608174b 100644
--- a/backend/app/routers/datasets.py
+++ b/backend/app/routers/datasets.py
@@ -63,7 +63,7 @@
 )
 from beanie import PydanticObjectId
 from beanie.operators import And, Or
-from bson import ObjectId, json_util
+from bson import json_util
 from elasticsearch import Elasticsearch
 from fastapi import APIRouter, Depends, File, HTTPException, Request, UploadFile
 from fastapi.responses import StreamingResponse
@@ -73,6 +73,7 @@
 from pymongo import DESCENDING
 from rocrate.model.person import Person
 from rocrate.rocrate import ROCrate
+from starlette.concurrency import run_in_threadpool
 
 router = APIRouter()
 security = HTTPBearer()
@@ -556,33 +557,41 @@ async def get_freeze_datasets(
     skip: int = 0,
     limit: int = 10,
     user=Depends(get_current_user),
-    fs: Minio = Depends(dependencies.get_fs),
-    es: Elasticsearch = Depends(dependencies.get_elasticsearchclient),
-    allow: bool = Depends(Authorization("owner")),
+    authenticated: bool = Depends(CheckStatus("AUTHENTICATED")),
+    public: bool = Depends(CheckStatus("PUBLIC")),
+    admin=Depends(get_admin),
+    admin_mode: bool = Depends(get_admin_mode),
+    viewer: bool = Depends(Authorization("viewer")),
 ):
-    frozen_datasets_and_count = (
-        await DatasetFreezeDB.find(
-            DatasetFreezeDB.origin_id == PydanticObjectId(dataset_id)
+    if authenticated or public or (admin and admin_mode) or viewer:
+        frozen_datasets_and_count = (
+            await DatasetFreezeDB.find(
+                DatasetFreezeDB.origin_id == PydanticObjectId(dataset_id)
+            )
+            .aggregate(
+                [
+                    _get_page_query(
+                        skip, limit, sort_field="frozen_version_num", ascending=False
+                    )
+                ],
+            )
+            .to_list()
         )
-        .aggregate(
-            [
-                _get_page_query(
-                    skip, limit, sort_field="frozen_version_num", ascending=False
-                )
+
+        page_metadata = _construct_page_metadata(frozen_datasets_and_count, skip, limit)
+        page = Paged(
+            metadata=page_metadata,
+            data=[
+                DatasetFreezeOut(id=item.pop("_id"), **item)
+                for item in frozen_datasets_and_count[0]["data"]
             ],
         )
-        .to_list()
-    )
-
-    page_metadata = _construct_page_metadata(frozen_datasets_and_count, skip, limit)
-    page = Paged(
-        metadata=page_metadata,
-        data=[
-            DatasetFreezeOut(id=item.pop("_id"), **item)
-            for item in frozen_datasets_and_count[0]["data"]
-        ],
-    )
-    return page.dict()
+        return page.dict()
+    else:
+        raise HTTPException(
+            status_code=403,
+            detail=f"User {user} does not have access to view freeze list for dataset {dataset_id}",
+        )
 
 
 @router.get("/{dataset_id}/freeze/latest_version_num", response_model=int)
@@ -1192,16 +1201,26 @@ async def download_dataset(
         bag_info_path = os.path.join(current_temp_dir, "bag-info.txt")
         tagmanifest_path = os.path.join(current_temp_dir, "tagmanifest-md5.txt")
 
-        with open(manifest_path, "w") as f:
-            pass  # Create empty file so no errors later if the dataset is empty
-
-        with open(bagit_path, "w") as f:
-            f.write("Bag-Software-Agent: clowder.ncsa.illinois.edu" + "\n")
-            f.write("Bagging-Date: " + str(datetime.datetime.now()) + "\n")
+        await run_in_threadpool(lambda: open(manifest_path, "w").close())
+        await run_in_threadpool(lambda: open(manifest_path, "w").close())
+        await run_in_threadpool(
+            lambda: open(bagit_path, "w").write(
+                "Bag-Software-Agent: clowder.ncsa.illinois.edu"
+                + "\n"
+                + "Bagging-Date: "
+                + str(datetime.datetime.now())
+                + "\n"
+            )
+        )
 
-        with open(bag_info_path, "w") as f:
-            f.write("BagIt-Version: 0.97" + "\n")
-            f.write("Tag-File-Character-Encoding: UTF-8" + "\n")
+        await run_in_threadpool(
+            lambda: open(bag_info_path, "w").write(
+                "BagIt-Version: 0.97"
+                + "\n"
+                + "Tag-File-Character-Encoding: UTF-8"
+                + "\n"
+            )
+        )
 
         # Write dataset metadata if found
         metadata = await MetadataDB.find(
@@ -1214,6 +1233,10 @@ async def download_dataset(
             metadata_content = json_util.dumps(metadata)
             with open(datasetmetadata_path, "w") as f:
                 f.write(metadata_content)
+            await run_in_threadpool(
+                lambda: open(datasetmetadata_path, "w").write(metadata_content)
+            )
+
             crate.add_file(
                 datasetmetadata_path,
                 dest_path="metadata/_dataset_metadata.json",
@@ -1236,16 +1259,20 @@ async def download_dataset(
                 hierarchy = await _get_folder_hierarchy(file.folder_id, "")
                 dest_folder = os.path.join(current_temp_dir, hierarchy.lstrip("/"))
                 if not os.path.isdir(dest_folder):
-                    os.makedirs(dest_folder, exist_ok=True)
+                    await run_in_threadpool(os.makedirs, dest_folder, exist_ok=True)
                 file_name = hierarchy + file_name
             current_file_path = os.path.join(current_temp_dir, file_name.lstrip("/"))
 
             content = fs.get_object(settings.MINIO_BUCKET_NAME, bytes_file_id)
             file_md5_hash = hashlib.md5(content.data).hexdigest()
-            with open(current_file_path, "wb") as f1:
-                f1.write(content.data)
-            with open(manifest_path, "a") as mpf:
-                mpf.write(file_md5_hash + " " + file_name + "\n")
+            await run_in_threadpool(
+                lambda: open(current_file_path, "wb").write(content.data)
+            )
+            await run_in_threadpool(
+                lambda: open(manifest_path, "a").write(
+                    file_md5_hash + " " + file_name + "\n"
+                )
+            )
             crate.add_file(
                 current_file_path,
                 dest_path="data/" + file_name,
@@ -1266,8 +1293,11 @@ async def download_dataset(
                     current_temp_dir, metadata_filename
                 )
                 metadata_content = json_util.dumps(metadata)
-                with open(metadata_filename_temp_path, "w") as f:
-                    f.write(metadata_content)
+                await run_in_threadpool(
+                    lambda: open(metadata_filename_temp_path, "w").write(
+                        metadata_content
+                    )
+                )
                 crate.add_file(
                     metadata_filename_temp_path,
                     dest_path="metadata/" + metadata_filename,
@@ -1275,14 +1305,31 @@ async def download_dataset(
                 )
 
         bag_size_kb = bag_size / 1024
-
-        with open(bagit_path, "a") as f:
-            f.write("Bag-Size: " + str(bag_size_kb) + " kB" + "\n")
-            f.write("Payload-Oxum: " + str(bag_size) + "." + str(file_count) + "\n")
-            f.write("Internal-Sender-Identifier: " + dataset_id + "\n")
-            f.write("Internal-Sender-Description: " + dataset.description + "\n")
-            f.write("Contact-Name: " + user_full_name + "\n")
-            f.write("Contact-Email: " + user.email + "\n")
+        await run_in_threadpool(
+            lambda: open(bagit_path, "a").write(
+                "Bag-Size: "
+                + str(bag_size_kb)
+                + " kB"
+                + "\n"
+                + "Payload-Oxum: "
+                + str(bag_size)
+                + "."
+                + str(file_count)
+                + "\n"
+                + "Internal-Sender-Identifier: "
+                + dataset_id
+                + "\n"
+                + "Internal-Sender-Description: "
+                + dataset.description
+                + "\n"
+                + "Contact-Name: "
+                + user_full_name
+                + "\n"
+                + "Contact-Email: "
+                + user.email
+                + "\n"
+            )
+        )
         crate.add_file(
             bagit_path, dest_path="bagit.txt", properties={"name": "bagit.txt"}
         )
@@ -1296,14 +1343,33 @@ async def download_dataset(
         )
 
         # Generate tag manifest file
-        manifest_md5_hash = hashlib.md5(open(manifest_path, "rb").read()).hexdigest()
-        bagit_md5_hash = hashlib.md5(open(bagit_path, "rb").read()).hexdigest()
-        bag_info_md5_hash = hashlib.md5(open(bag_info_path, "rb").read()).hexdigest()
-
-        with open(tagmanifest_path, "w") as f:
-            f.write(bagit_md5_hash + " " + "bagit.txt" + "\n")
-            f.write(manifest_md5_hash + " " + "manifest-md5.txt" + "\n")
-            f.write(bag_info_md5_hash + " " + "bag-info.txt" + "\n")
+        manifest_md5_hash = await run_in_threadpool(
+            lambda: hashlib.md5(open(manifest_path, "rb").read()).hexdigest()
+        )
+        bagit_md5_hash = await run_in_threadpool(
+            lambda: hashlib.md5(open(bagit_path, "rb").read()).hexdigest()
+        )
+        bag_info_md5_hash = await run_in_threadpool(
+            lambda: hashlib.md5(open(bag_info_path, "rb").read()).hexdigest()
+        )
+
+        await run_in_threadpool(
+            lambda: open(tagmanifest_path, "w").write(
+                bagit_md5_hash
+                + " "
+                + "bagit.txt"
+                + "\n"
+                + manifest_md5_hash
+                + " "
+                + "manifest-md5.txt"
+                + "\n"
+                + bag_info_md5_hash
+                + " "
+                + "bag-info.txt"
+                + "\n"
+            )
+        )
+
         crate.add_file(
             tagmanifest_path,
             dest_path="tagmanifest-md5.txt",
@@ -1317,13 +1383,16 @@ async def download_dataset(
         )
         zip_name = dataset.name + version_name + ".zip"
         path_to_zip = os.path.join(current_temp_dir, zip_name)
-        crate.write_zip(path_to_zip)
-        f = open(path_to_zip, "rb", buffering=0)
-        zip_bytes = f.read()
+
+        await run_in_threadpool(crate.write_zip, path_to_zip)  # takes the most time?
+
+        f = await run_in_threadpool(open, path_to_zip, "rb", 0)
+        zip_bytes = await run_in_threadpool(f.read)
         stream = io.BytesIO(zip_bytes)
-        f.close()
+        await run_in_threadpool(f.close)
+
         try:
-            shutil.rmtree(current_temp_dir)
+            await run_in_threadpool(shutil.rmtree, current_temp_dir)
         except Exception as e:
             print("could not delete file")
             print(e)
diff --git a/backend/app/routers/keycloak.py b/backend/app/routers/keycloak.py
index 7590ebcfc..075ccfe60 100644
--- a/backend/app/routers/keycloak.py
+++ b/backend/app/routers/keycloak.py
@@ -11,7 +11,8 @@
     retreive_refresh_token,
 )
 from app.models.tokens import TokenDB
-from app.models.users import UserDB, UserIn
+from app.models.users import UserDB, UserLogin
+from app.routers.utils import save_refresh_token
 from fastapi import APIRouter, HTTPException, Security
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from jose import ExpiredSignatureError, JWTError, jwt
@@ -80,10 +81,11 @@ async def logout(
 
 
 @router.post("/login")
-async def loginPost(userIn: UserIn):
+async def loginPost(userIn: UserLogin):
     """Client can use this to login when redirect is not available."""
     try:
         token = keycloak_openid.token(userIn.email, userIn.password)
+        await save_refresh_token(token["refresh_token"], userIn.email)
         return {"token": token["access_token"]}
     # bad credentials
     except KeycloakAuthenticationError as e:
diff --git a/backend/app/routers/metadata_datasets.py b/backend/app/routers/metadata_datasets.py
index 0f46e1835..8431f5d20 100644
--- a/backend/app/routers/metadata_datasets.py
+++ b/backend/app/routers/metadata_datasets.py
@@ -23,7 +23,6 @@
 from app.search.connect import delete_document_by_id
 from app.search.index import index_dataset
 from beanie import PydanticObjectId
-from bson import ObjectId
 from elasticsearch import Elasticsearch
 from fastapi import APIRouter, Depends, Form, HTTPException
 
@@ -105,6 +104,16 @@ async def add_dataset_metadata(
                     f"Metadata for {metadata_in.definition} already exists on this dataset",
                 )
 
+        # lookup json_ld context in metadata definition
+        if metadata_in.definition is not None:
+            if (
+                definition := await MetadataDefinitionDB.find_one(
+                    MetadataDefinitionDB.name == metadata_in.definition
+                )
+            ) is not None:
+                metadata_in.context = definition.context
+                metadata_in.context_url = definition.context_url
+
         md = await _build_metadata_db_obj(
             metadata_in, DatasetOut(**dataset.dict()), user
         )
diff --git a/backend/app/routers/metadata_files.py b/backend/app/routers/metadata_files.py
index 7f9a082fe..9980a6d18 100644
--- a/backend/app/routers/metadata_files.py
+++ b/backend/app/routers/metadata_files.py
@@ -1,11 +1,5 @@
 from typing import List, Optional
 
-from beanie import PydanticObjectId
-from beanie.operators import Or
-from bson import ObjectId
-from elasticsearch import Elasticsearch
-from fastapi import APIRouter, Depends, Form, HTTPException
-
 from app import dependencies
 from app.config import settings
 from app.deps.authorization_deps import FileAuthorization
@@ -28,6 +22,11 @@
 )
 from app.search.connect import delete_document_by_id
 from app.search.index import index_file
+from beanie import PydanticObjectId
+from beanie.operators import Or
+from bson import ObjectId
+from elasticsearch import Elasticsearch
+from fastapi import APIRouter, Depends, Form, HTTPException
 
 router = APIRouter()
 
@@ -145,6 +144,16 @@ async def add_file_metadata(
                         409, f"Metadata for {definition} already exists on this file"
                     )
 
+        # lookup json_ld context in metadata definition
+        if metadata_in.definition is not None:
+            if (
+                definition := await MetadataDefinitionDB.find_one(
+                    MetadataDefinitionDB.name == metadata_in.definition
+                )
+            ) is not None:
+                metadata_in.context = definition.context
+                metadata_in.context_url = definition.context_url
+
         md = await _build_metadata_db_obj(metadata_in, FileOut(**file.dict()), user)
         await md.insert()
 
@@ -210,19 +219,31 @@ async def replace_file_metadata(
 
         if (orig_md := await MetadataDB.find_one(*query)) is not None:
             # Metadata exists, so prepare the new document we are going to replace it with
-            md = await _build_metadata_db_obj(
+
+            # lookup json_ld context in metadata definition
+            if metadata_in.definition is not None:
+                if (
+                    definition := await MetadataDefinitionDB.find_one(
+                        MetadataDefinitionDB.name == metadata_in.definition
+                    )
+                ) is not None:
+                    metadata_in.context = definition.context
+                    metadata_in.context_url = definition.context_url
+
+            new_md = await _build_metadata_db_obj(
                 metadata_in,
                 FileOut(**file.dict()),
                 user,
                 agent=agent,
                 version=target_version,
             )
-            md.id = orig_md.id
-            await md.save()
+            new_md.id = orig_md.id
+
+            patched_md = await patch_metadata(orig_md, new_md.content, es)
 
             # Update entry to the metadata index
             await index_file(es, FileOut(**file.dict()), update=True)
-            return md.dict()
+            return patched_md.dict()
         else:
             raise HTTPException(status_code=404, detail="No metadata found to update")
     else:
diff --git a/backend/app/routers/utils.py b/backend/app/routers/utils.py
index 25c5656fd..b71f65878 100644
--- a/backend/app/routers/utils.py
+++ b/backend/app/routers/utils.py
@@ -2,6 +2,7 @@
 from typing import Optional
 
 from app.models.files import ContentType
+from app.models.tokens import TokenDB
 
 
 def get_content_type(
@@ -23,3 +24,14 @@ def get_content_type(
             content_type = "application/octet-stream"
     type_main = content_type.split("/")[0] if type(content_type) is str else "N/A"
     return ContentType(content_type=content_type, main_type=type_main)
+
+
+async def save_refresh_token(refresh_token: str, email: str):
+    """Store/update refresh token and link to that userid."""
+    token_exist = await TokenDB.find_one(TokenDB.email == email)
+    if token_exist is not None:
+        token_exist.refresh_token = refresh_token
+        await token_exist.save()
+    else:
+        token_created = TokenDB(email=email, refresh_token=refresh_token)
+        await token_created.insert()
diff --git a/backend/app/tests/test_metadata.py b/backend/app/tests/test_metadata.py
index ee60a4e63..e7949442c 100644
--- a/backend/app/tests/test_metadata.py
+++ b/backend/app/tests/test_metadata.py
@@ -184,7 +184,7 @@ async def test_dataset_patch_metadata_definition(client: TestClient, headers: di
         result.body["responses"][0]["hits"]["hits"][0]["_source"]["metadata"][0][
             "latitude"
         ]
-        == 24.4
+        == "24.4"
     )
 
 
diff --git a/backend/heartbeat_listener.py b/backend/heartbeat_listener.py
index 6c82f6cbb..02560d21c 100644
--- a/backend/heartbeat_listener.py
+++ b/backend/heartbeat_listener.py
@@ -7,12 +7,11 @@
 
 from aio_pika import connect_robust
 from aio_pika.abc import AbstractIncomingMessage
-from packaging import version
-
 from app.config import settings
 from app.main import startup_beanie
 from app.models.listeners import EventListenerDB, EventListenerOut, ExtractorInfo
 from app.routers.listeners import _process_incoming_v1_extractor_info
+from packaging import version
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -31,7 +30,7 @@ async def callback(message: AbstractIncomingMessage):
         msg = json.loads(message.body.decode("utf-8"))
 
         extractor_info = msg["extractor_info"]
-        owner = msg["owner"]
+        owner = msg.get("owner")
         if owner is not None and owner != "":
             # Extractor name should match queue, which includes secret key with common extractor_info["name"]
             orig_properties = ExtractorInfo(**extractor_info)
diff --git a/backend/message_listener.py b/backend/message_listener.py
index 9517ddfb3..acc55a67d 100644
--- a/backend/message_listener.py
+++ b/backend/message_listener.py
@@ -16,7 +16,7 @@
     EventListenerJobStatus,
     EventListenerJobUpdateDB,
 )
-from bson import ObjectId
+from beanie import PydanticObjectId
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
diff --git a/deployments/kubernetes/charts/clowder2/Chart.yaml b/deployments/kubernetes/charts/clowder2/Chart.yaml
index dabacef56..fea872e94 100644
--- a/deployments/kubernetes/charts/clowder2/Chart.yaml
+++ b/deployments/kubernetes/charts/clowder2/Chart.yaml
@@ -13,13 +13,13 @@ description: >
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.9.1
+version: 1.9.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.0.0-beta.2"
+appVersion: "2.0.0-beta.3"
 
 # List of people that maintain this helm chart.
 maintainers:
diff --git a/deployments/kubernetes/charts/clowder2/README.md b/deployments/kubernetes/charts/clowder2/README.md
index 76f43513e..0f7c69768 100644
--- a/deployments/kubernetes/charts/clowder2/README.md
+++ b/deployments/kubernetes/charts/clowder2/README.md
@@ -17,13 +17,13 @@ hostname: { your hostname. E.g. clowder2.software-dev.ncsa.illinois.edu }
 frontend:
   image:
     repository: clowder/clowder2-frontend
-    tag: 2.0.0-beta.2
+    tag: 2.0.0-beta.3
     pullPolicy: Always
 
 backend:
   image:
     repository: clowder/clowder2-backend
-    tag: 2.0.0-beta.2
+    tag: 2.0.0-beta.3
     pullPolicy: Always
 
 geoserver:
diff --git a/deployments/kubernetes/charts/clowder2/littlebeats.yaml b/deployments/kubernetes/charts/clowder2/littlebeats.yaml
new file mode 100644
index 000000000..915b8671d
--- /dev/null
+++ b/deployments/kubernetes/charts/clowder2/littlebeats.yaml
@@ -0,0 +1,134 @@
+hostname: &hostname littlebeats.clowderframework.org
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+  tls:
+    - hosts:
+        - *hostname
+      secretName: littlebeats.clowderframework.org-tls
+
+minio:
+  auth:
+    rootUser: littlebeats
+    existingSecret: littlebeats-secret
+    rootPasswordSecretKey: root-password
+  persistence:
+    storageClass: nfs-taiga
+    size: 20Gi
+  ingress:
+    enabled: false
+  apiIngress:
+    enabled: true
+    hostname: minio-api.littlebeats.clowderframework.org
+
+rabbitmq:
+  auth:
+    username: littlebeats
+    existingPasswordSecret: littlebeats-secret
+    existingErlangSecret: littlebeats-secret
+    existingSecretPasswordKey: rabbitmq-password
+    erlangCookie: kittencookie
+  ingress:
+    enabled: false
+  persistence:
+    storageClass: csi-cinder-sc-retain
+    size: 8Gi
+
+mongodb:
+  persistence:
+    storageClass: csi-cinder-sc-retain
+    size: 8Gi
+
+elasticsearch:
+  master:
+    persistence:
+      storageClass: csi-cinder-sc-retain
+      size: 8Gi
+  data:
+    persistence:
+      storageClass: csi-cinder-sc-retain
+      size: 8Gi
+
+keycloak:
+  auth:
+    existingSecret: littlebeats-secret
+    adminUser: littlebeats
+  ingress:
+    hostname: *hostname
+    path: /keycloak
+    tls: true
+    annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-prod
+      nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
+
+  postgresql:
+    auth:
+      existingSecret: littlebeats-secret
+      username: keycloak
+      database: keycloak
+    primary:
+      persistence:
+        storageClass: csi-cinder-sc-retain
+        size: 8Gi
+
+geoserver:
+  enabled: false
+
+backend:
+  existingSecret: littlebeats-secret
+  env:
+    MINIO_SERVER_URL: littlebeats-minio:9000
+    MONGODB_URL: mongodb://littlebeats-mongodb:27017
+    oauth2_scheme_auth_url: http://littlebeats-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
+    auth_register_url: /keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code&redirect_uri=$(auth_redirect_uri)&scope=openid%20email
+    auth_token_url: http://littlebeats-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token
+    elasticsearch_url: http://littlebeats-elasticsearch:9200
+    RABBITMQ_HOST: littlebeats-rabbitmq
+    API_HOST: http://littlebeats-clowder2-backend:80
+
+message:
+  existingSecret: littlebeats-secret
+  env:
+    MONGODB_URL: mongodb://littlebeats-mongodb:27017
+    RABBITMQ_HOST: littlebeats-rabbitmq
+
+heartbeat:
+  existingSecret: littlebeats-secret
+  env:
+    MONGODB_URL: mongodb://littlebeats-mongodb:27017
+    RABBITMQ_HOST: littlebeats-rabbitmq
+
+extractors:
+  littlebeats-extractor:
+    image: clowder/extractors-littlebeats:latest
+    existingSecret: littlebeats-secret
+    env:
+      - name: USERNAME
+        value: ccp-littlebeats
+      - name: PASSWORD
+        valueFrom:
+          secretKeyRef:
+            name: littlebeats-secret
+            key: extractor-password
+
+frontend:
+  image:
+    repository: clowder/clowder2-frontend
+    tag: 2.0.0-beta.2
+
+backend:
+  image:
+    repository: clowder/clowder2-backend
+    tag: 2.0.0-beta.2
+
+message:
+  image:
+    repository: clowder/clowder2-messages
+    tag: 2.0.0-beta.2
+
+heartbeat:
+  image:
+    repository: clowder/clowder2-heartbeat
+    tag: 2.0.0-beta.2
diff --git a/deployments/kubernetes/charts/clowder2/templates/NOTES.txt b/deployments/kubernetes/charts/clowder2/templates/NOTES.txt
index e0dfa09a9..8ba1c1c8a 100644
--- a/deployments/kubernetes/charts/clowder2/templates/NOTES.txt
+++ b/deployments/kubernetes/charts/clowder2/templates/NOTES.txt
@@ -15,7 +15,7 @@
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "clowder2.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.frontend.service.port }}
 {{- else if contains "ClusterIP" .Values.frontend.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "clowder2.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "clowder2.fullname" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
diff --git a/deployments/kubernetes/charts/clowder2/templates/_helpers.tpl b/deployments/kubernetes/charts/clowder2/templates/_helpers.tpl
index da435e845..f9d610c3c 100644
--- a/deployments/kubernetes/charts/clowder2/templates/_helpers.tpl
+++ b/deployments/kubernetes/charts/clowder2/templates/_helpers.tpl
@@ -5,6 +5,13 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Define release name.
+*/}}
+{{- define "clowder2.releaseName" -}}
+{{- default .Release.Name .Values.releaseOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -46,7 +53,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "clowder2.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clowder2.name" . }}
+app.kubernetes.io/name: {{ include "clowder2.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
diff --git a/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml
index 988fc536c..55962ffb6 100644
--- a/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml
@@ -10,7 +10,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "clowder2.name" . }}-backend
+      app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-backend
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "clowder2.name" . }}-backend
+        app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-backend
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       {{- with .Values.imagePullSecrets }}
@@ -39,8 +39,7 @@ spec:
             - name: WEB_CONCURRENCY
               value: "1"
             - name: MINIO_SERVER_URL
-              value: {{ include "clowder2.name" . }}-minio:9000
-#              value: {{ include "clowder2.name" . }}-minio-headless:9000
+              value: {{ include "clowder2.releaseName" . }}-minio:9000
             - name: MINIO_EXTERNAL_SERVER_URL
               value: minio-api.{{ .Values.hostname }}
             - name: MINIO_SECURE
@@ -50,14 +49,21 @@ spec:
             - name: MINIO_ACCESS_KEY
               value: {{ .Values.minio.auth.rootUser }}
             - name: MINIO_SECRET_KEY
+              {{- if .Values.backend.existingSecret }}
               valueFrom:
                 secretKeyRef:
-                  name: clowder2-minio
+                  name: {{ .Values.backend.existingSecret }}
+                  key: {{ .Values.backend.existingMinioSecretKey | default "root-password" }}
+              {{- else }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{include "clowder2.releaseName" . }}-secret
                   key: root-password
+              {{- end }}
             - name: MINIO_UPLOAD_CHUNK_SIZE
               value: "10485760"
             - name: MONGODB_URL
-              value: mongodb://{{ include "clowder2.name" . }}-mongodb:27017
+              value: mongodb://{{ include "clowder2.releaseName" . }}-mongodb:27017
             - name: MONGO_DATABASE
               value: {{ .Values.mongodb.database }}
             - name: CLOWDER2_URL
@@ -73,11 +79,11 @@ spec:
             - name: auth_url
               value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
             - name: oauth2_scheme_auth_url
-              value: http://{{ include "clowder2.name" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
+              value: http://{{ include "clowder2.releaseName" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
             - name: auth_register_url
               value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code&redirect_uri=$(auth_redirect_uri)&scope=openid%20email
             - name: auth_token_url
-              value: http://{{ include "clowder2.name" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token
+              value: http://{{ include "clowder2.releaseName" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token
             - name: auth_server_url
               value: $(CLOWDER2_URL)/keycloak/
             - name: keycloak_base
@@ -85,7 +91,7 @@ spec:
             - name: frontend_url
               value: $(CLOWDER2_URL)
             - name: elasticsearch_url
-              value: http://{{ include "clowder2.name" . }}-elasticsearch:9200
+              value: http://{{ include "clowder2.releaseName" . }}-elasticsearch:9200
             - name: elasticsearch_no_of_shards
               value: "5"
             - name: elasticsearch_no_of_replicas
@@ -93,17 +99,23 @@ spec:
             - name: RABBITMQ_USER
               value: {{ .Values.rabbitmq.auth.username }}
             - name: RABBITMQ_PASS
+              {{- if .Values.backend.existingSecret }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.backend.existingSecret }}
+                  key: {{ .Values.backend.existingRabbitMQSecretKey | default "rabbitmq-password" }}
+              {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: clowder2-rabbitmq
+                  name: {{ include "clowder2.releaseName" . }}-secret
                   key: rabbitmq-password
+              {{- end }}
             - name: RABBITMQ_HOST
-              value: {{ include "clowder2.name" .  }}-rabbitmq
+              value: {{ include "clowder2.releaseName" .  }}-rabbitmq
             - name: HEARTBEAT_EXCHANGE
               value: "extractors"
             - name: API_HOST
-#              value: $(CLOWDER2_URL)
-              value: http://{{ include "clowder2.name" . }}-backend:{{ .Values.backend.service.port }}
+              value: http://{{ include "clowder2.fullname" . }}-backend:{{ .Values.backend.service.port }}
           ports:
             - name: http
               containerPort: 80
diff --git a/deployments/kubernetes/charts/clowder2/templates/backend/ingress.yaml b/deployments/kubernetes/charts/clowder2/templates/backend/ingress.yaml
index 41423cc31..0b7ddec6b 100644
--- a/deployments/kubernetes/charts/clowder2/templates/backend/ingress.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/backend/ingress.yaml
@@ -21,7 +21,6 @@ spec:
   {{- if .Values.ingress.tls }}
   tls:
     - hosts:
-        - {{ .Values.hostname }}
     {{- range .Values.ingress.tls }}
         {{- range .hosts }}
         - {{ . | quote }}
diff --git a/deployments/kubernetes/charts/clowder2/templates/extractors/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/extractors/deployment.yaml
index ab055b7c7..7de69d846 100644
--- a/deployments/kubernetes/charts/clowder2/templates/extractors/deployment.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/extractors/deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.extractors }}
 {{- $fullname := include "clowder2.fullname" . }}
-{{- $name := include "clowder2.name" . }}
+{{- $name := include "clowder2.releaseName" . }}
 {{- $labels := include "clowder2.labels" . }}
 {{- range $key, $val := .Values.extractors }}
 {{- if or .enabled (not (hasKey . "enabled")) }}
@@ -38,10 +38,17 @@ spec:
             - name: RABBITMQ_USER
               value: {{ $.Values.rabbitmq.auth.username }}
             - name: RABBITMQ_PASS
+              {{- if $val.existingSecret }}
               valueFrom:
                 secretKeyRef:
-                  name: clowder2-rabbitmq
+                  name: {{ $val.existingSecret }}
+                  key: {{ $val.existingRabbitMQSecretKey | default "rabbitmq-password" }}
+              {{- else }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $name }}-secret
                   key: rabbitmq-password
+              {{- end }}
             - name: CLOWDER_VERSION
               value: "2"
             - name: RABBITMQ_URI
diff --git a/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml
index eab44f6be..51cb9ca6c 100644
--- a/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml
@@ -10,7 +10,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "clowder2.name" . }}-frontend
+      app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-frontend
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "clowder2.name" . }}-frontend
+        app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-frontend
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       {{- with .Values.imagePullSecrets }}
diff --git a/deployments/kubernetes/charts/clowder2/templates/frontend/ingress.yaml b/deployments/kubernetes/charts/clowder2/templates/frontend/ingress.yaml
index dde70f74c..f54044a36 100644
--- a/deployments/kubernetes/charts/clowder2/templates/frontend/ingress.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/frontend/ingress.yaml
@@ -21,7 +21,6 @@ spec:
   {{- if .Values.ingress.tls }}
   tls:
     - hosts:
-        - {{ .Values.hostname }}
     {{- range .Values.ingress.tls }}
         {{- range .hosts }}
         - {{ . | quote }}
diff --git a/deployments/kubernetes/charts/clowder2/templates/geoserver/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/geoserver/deployment.yaml
index 2a97c6ac1..9aaba90d1 100644
--- a/deployments/kubernetes/charts/clowder2/templates/geoserver/deployment.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/geoserver/deployment.yaml
@@ -9,14 +9,14 @@ spec:
   replicas: {{ .Values.geoserver.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "clowder2.name" . }}-geoserver
+      app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-geoserver
       app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
     type: RollingUpdate
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "clowder2.name" . }}-geoserver
+        app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-geoserver
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       {{- with .Values.imagePullSecrets }}
@@ -29,15 +29,19 @@ spec:
           imagePullPolicy: {{ .Values.geoserver.image.pullPolicy }}
           env:
             - name: GEOSERVER_ADMIN_USER
+              value: {{ .Values.geoserver.username }}
+            - name: GEOSERVER_ADMIN_PASSWORD
+              {{- if .Values.geoserver.existingSecret }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "clowder2.fullname" . }}-services
-                  key: GEOSERVER_USER
-            - name: GEOSERVER_ADMIN_PASSWORD
+                  name: {{.Values.geoserver.existingSecret }}
+                  key: {{.Values.geoserver.existingGeoserverSecretKey | default "GEOSERVER_PW" }}
+              {{- else }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "clowder2.fullname" . }}-services
+                  name: {{include "clowder2.releaseName" . }}-secret
                   key: GEOSERVER_PW
+              {{- end }}
           ports:
             - containerPort: 8080
               name: geoserver
diff --git a/deployments/kubernetes/charts/clowder2/templates/geoserver/service.yaml b/deployments/kubernetes/charts/clowder2/templates/geoserver/service.yaml
index 3a967f618..83e341cb0 100644
--- a/deployments/kubernetes/charts/clowder2/templates/geoserver/service.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/geoserver/service.yaml
@@ -13,6 +13,6 @@ spec:
       targetPort: geoserver
       protocol: TCP
   selector:
-    app.kubernetes.io/name: {{ include "clowder2.name" . }}-geoserver
+    app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-geoserver
     app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
diff --git a/deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml
index a2f53a69d..d306fec81 100644
--- a/deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml
@@ -10,7 +10,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "clowder2.name" . }}-heartbeat
+      app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-heartbeat
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "clowder2.name" . }}-heartbeat
+        app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-heartbeat
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       {{- with .Values.imagePullSecrets }}
@@ -34,16 +34,23 @@ spec:
           imagePullPolicy: {{ .Values.heartbeat.image.pullPolicy }}
           env:
             - name: MONGODB_URL
-              value: mongodb://{{ include "clowder2.name" . }}-mongodb:27017
+              value: mongodb://{{ include "clowder2.releaseName" . }}-mongodb:27017
             - name: RABBITMQ_USER
               value: {{ .Values.rabbitmq.auth.username }}
             - name: RABBITMQ_PASS
+              {{- if .Values.heartbeat.existingSecret }}
               valueFrom:
                 secretKeyRef:
-                  name: clowder2-rabbitmq
+                  name: {{.Values.heartbeat.existingSecret }}
+                  key: {{.Values.heartbeat.existingRabbitMQSecretKey | default "rabbitmq-password" }}
+              {{- else }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{include "clowder2.releaseName" . }}-secret
                   key: rabbitmq-password
+              {{- end }}
             - name: RABBITMQ_HOST
-              value: {{ include "clowder2.name" .  }}-rabbitmq
+              value: {{ include "clowder2.releaseName" .  }}-rabbitmq
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml
index 680bd1cd3..ab04f0008 100644
--- a/deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml
+++ b/deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml
@@ -10,7 +10,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "clowder2.name" . }}-messages
+      app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-messages
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "clowder2.name" . }}-messages
+        app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-messages
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       {{- with .Values.imagePullSecrets }}
@@ -34,16 +34,23 @@ spec:
           imagePullPolicy: {{ .Values.message.image.pullPolicy }}
           env:
             - name: MONGODB_URL
-              value: mongodb://{{ include "clowder2.name" . }}-mongodb:27017
+              value: mongodb://{{ include "clowder2.releaseName" . }}-mongodb:27017
             - name: RABBITMQ_USER
               value: {{ .Values.rabbitmq.auth.username }}
             - name: RABBITMQ_PASS
+              {{- if .Values.message.existingSecret }}
               valueFrom:
                 secretKeyRef:
-                  name: clowder2-rabbitmq
+                  name: {{ .Values.message.existingSecret }}
+                  key: {{ .Values.message.existingRabbitMQSecretKey | default "rabbitmq-password" }}
+              {{- else }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "clowder2.releaseName" . }}-secret
                   key: rabbitmq-password
+              {{- end }}
             - name: RABBITMQ_HOST
-              value: {{ include "clowder2.name" .  }}-rabbitmq
+              value: {{ include "clowder2.releaseName" .  }}-rabbitmq
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/deployments/kubernetes/charts/clowder2/values.yaml b/deployments/kubernetes/charts/clowder2/values.yaml
index 262aea520..ba4a709b5 100644
--- a/deployments/kubernetes/charts/clowder2/values.yaml
+++ b/deployments/kubernetes/charts/clowder2/values.yaml
@@ -51,7 +51,6 @@ backend:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-
   service:
     type: ClusterIP
     port: 80
@@ -60,7 +59,7 @@ backend:
 # GEOSERVER
 # ----------------------------------------------------------------------
 geoserver:
-  enabled : true
+  enabled : false
   username: admin
   password: admin
   workspace: clowder2
@@ -97,12 +96,12 @@ minio:
 
   # enable ingress for webui
   ingress:
-    enabled: true
+    enabled: false
     hostname: minio.clowder2.localhost
 
   # enable ingress for api
   apiIngress:
-    enabled: true
+    enabled: false
     hostname: minio-api.clowder2.localhost
 
   # enabled distributed mode (or standalone)
@@ -165,7 +164,7 @@ rabbitmq:
 
   # enable webfrontend
   ingress:
-    enabled: true
+    enabled: false
     hostname: rabbitmq.clowder2.localhost
 
   persistence:
@@ -175,40 +174,45 @@ rabbitmq:
 # ----------------------------------------------------------------------
 # DEFAULT EXTRACTOR SERVICES
 # ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# EXTRACTORS
 message:
   image:
     repository: clowder/clowder2-messages
-#    tag: main
     pullPolicy: Always
 
 heartbeat:
   image:
     repository: clowder/clowder2-heartbeat
-#    tag: main
     pullPolicy: Always
 
-
-# ----------------------------------------------------------------------
-# EXTRACTORS
-# ----------------------------------------------------------------------
 ## list of extractors to be installed. Each extractor should have the
 ## following fields:
 ## enabled      : true/false - should the extractor be installed
 ## image        : dokeer/image:tag - the extractor docker image
 ## replicaCount : number - the number of this extractor to install
 ## env          : additional environment variables to pass to extractor.
+
 extractors:
   wordcount:
+    enabled: false
     image: clowder/extractors-wordcount:latest
   image-preview:
+    enabled: false
     image: clowder/extractors-image-preview:latest
   image-metadata:
+    enabled: false
     image: clowder/extractors-image-metadata:latest
   audio-preview:
+    enabled: false
     image: clowder/extractors-audio-preview:latest
   file-digest:
+    enabled: false
     image: clowder/extractors-digest:latest
   geotiff-preview:
+    enabled: false
     image: clowder/extractors-geotiff-preview:latest
 
 # ----------------------------------------------------------------------
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 61dcc8bf0..2b4178357 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -131,6 +131,7 @@ services:
     environment:
       - cluster.name=clowder2
       - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
       - xpack.security.enabled=false
       - xpack.security.http.ssl.enabled=false
       - http.cors.allow-origin='*'
diff --git a/docker-compose.extractors.yml b/docker-compose.extractors.yml
index 2f63206b4..27b757a0a 100644
--- a/docker-compose.extractors.yml
+++ b/docker-compose.extractors.yml
@@ -1,6 +1,5 @@
 version: '3.7'
 
-
 services:
   name-entity-recognition:
     image: socialmediamacroscope/name_entity_recognition_extractor:latest
@@ -47,15 +46,6 @@ services:
       - clowder2
     restart: unless-stopped
 
-  wordcount:
-    image: clowder/extractors-wordcount:latest
-    environment:
-      CLOWDER_VERSION: 2
-      RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
-    networks:
-      - clowder2
-    restart: unless-stopped
-
   image-preview:
     image: clowder/extractors-image-preview:latest
     environment:
diff --git a/docker-compose.previewers.yml b/docker-compose.previewers.yml
index 9b2e0ee01..34f139b3e 100644
--- a/docker-compose.previewers.yml
+++ b/docker-compose.previewers.yml
@@ -1,21 +1,5 @@
 version: '3.7'
 
-# Settings and configurations that are common for all containers
-x-minio-common: &minio-common
-  image: quay.io/minio/minio:RELEASE.2022-01-25T19-56-04Z
-  command: server --console-address ":9001" http://minio{1...4}/data
-  expose:
-    - "9000"
-    - "9001"
-  environment:
-    MINIO_ROOT_USER: minioadmin
-    MINIO_ROOT_PASSWORD: minioadmin
-  healthcheck:
-    test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
-    interval: 30s
-    timeout: 20s
-    retries: 3
-
 services:
 
   geoserver:
diff --git a/docker-compose.yml b/docker-compose.yml
index f74ad11b6..f3b4c266c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
 
   backend:
-    image: 'clowder/clowder2-backend:2.0.0-beta.2'
+    image: 'clowder/clowder2-backend:2.0.0-beta.3'
     restart: unless-stopped
     build:
       context: ./backend
@@ -64,11 +64,16 @@ services:
       keycloak_base: http://localhost/api
       frontend_url: http://localhost
     depends_on:
-      - mongo
-      - minio-nginx
-      - keycloak
-      - elasticsearch
-      - rabbitmq
+      mongo:
+        condition: service_started
+      minio-nginx:
+        condition: service_started
+      keycloak:
+        condition: service_started
+      elasticsearch:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_started
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.backend.rule=PathPrefix(`/api`)"
@@ -77,7 +82,7 @@ services:
       - "traefik.http.routers.backend.priority=5"
 
   frontend:
-    image: "clowder/clowder2-frontend:2.0.0-beta.2"
+    image: "clowder/clowder2-frontend:2.0.0-beta.3"
     restart: unless-stopped
     build:
       context: ./frontend
@@ -245,6 +250,8 @@ services:
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.3.3
     restart: unless-stopped
+    healthcheck:
+      test: "curl -f http://localhost:9200/_cluster/health?wait_for_status=yellow"
     networks:
       - clowder2
     environment:
diff --git a/docs/docs/devs/devhandbook.md b/docs/docs/devs/devhandbook.md
new file mode 100644
index 000000000..729834cc6
--- /dev/null
+++ b/docs/docs/devs/devhandbook.md
@@ -0,0 +1,719 @@
+# Clowder Developer Handbook
+
+# 1. Change Clowder Core
+
+## 1.1 Backend
+
+### 1.1.1 API Routes
+
+- Backend API routes interact with the frontend.
+
+- A controller exists for each type of object (file, dataset, users,
+  etc)
+
+- Routes take arguments from the user and dependencies and handle
+  dependencies.
+
+- Run Codegen when you add new routes/models to the backend to update
+  the front end. That will add new methods to the various
+  frontend/openapi/services and models.
+
+    - npm run codegen:v2:dev
+
+- Routes are annotated with \@get \@post \@put in FastAPI, whatever
+  the type of request is being made. The response_model tells you what
+  the method returns.
+
+Here we see the method - what the arguments are. This is the
+get_datasets method that populates the datasets you see in the 'Explore'
+page.
+
+```python
+@router.get("", response_model=Paged)
+async def get_datasets(
+        user_id=Depends(get_user),
+        skip: int = 0,
+        limit: int = 10,
+        mine: bool = False,
+        admin=Depends(get_admin),
+        enable_admin: bool = False,
+        admin_mode: bool = Depends(get_admin_mode),
+):
+```
+
+A query is created depending on these values. We see the default values
+here for 'skip', 'limit' 'mine' and 'enable_admin' and 'admin_mode.'
+Some are passed in as parameters, others come from dependencies like
+Depends(get_user). Here we see that since 'mine' is true, we check that
+the creator.email is the same as the current user_id from
+Depends(get_user). Below we see the query that will be used to find the
+results using the DatasetDBViewList db table.
+
+```python
+if mine:
+    query.append(DatasetDBViewList.creator.email == user_id)
+datasets_and_count = (
+    await DatasetDBViewList.find(*query)
+    .aggregate(
+        [_get_page_query(skip, limit, sort_field="created", ascending=False)],
+    )
+    .to_list()
+)
+
+```
+
+The results are returned as 'Paged' and as a dict for the front end. An
+object would be returned as
+
+A dictionary as well.
+
+```python
+page = Paged(
+    metadata=page_metadata,
+    data=[
+        DatasetOut(id=item.pop("_id"), **item)
+        for item in datasets_and_count[0]["data"]
+    ],
+)
+
+return page.dict()
+```
+
+[Link](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/backend/app/routers/datasets.py#L220C1-L278C23)
+to full method on github.
+
+To interact with the backend as a user directly, you can create an API
+key for a user. Postman app or python requests are two options for
+interacting with the back end directly instead of through the frontend
+interface. When adding new methods, it can be helpful to test the
+backend separately from the front end.
+
+### 1.1.2 Models
+
+Models folder (under
+[backend/app/models/](https://github.com/clowder-framework/clowder2/tree/bb35e0b5040443abb847e658ad61f622f189f6bb/backend/app/models))
+holds data models.
+
+```python
+class DatasetBaseCommon(DatasetBase):
+    creator: UserOut
+    created: datetime = Field(default_factory=datetime.utcnow)
+    modified: datetime = Field(default_factory=datetime.utcnow)
+    status: str = DatasetStatus.PRIVATE.name
+    user_views: int = 0
+    downloads: int = 0
+    thumbnail_id: Optional[PydanticObjectId] = None
+    origin_id: Optional[PydanticObjectId] = None
+    standard_license: bool = True
+    license_id: Optional[str] = None
+```
+
+If you wish to add a field in any existing model, locate the model you
+wish to change and add it with corresponding types, and if needed, a
+default value.
+
+E.g. I wish to have a "favorite" field stored in each of the dataset
+documents.
+
+```python
+class DatasetBaseCommon(DatasetBase):
+    ...
+    favorite: bool = False
+
+
+```
+
+#### 1.1.2.1 Conventions
+
+{XXX}**DBViewList** - View Models. These models are used to create views
+in MongoDB, which aggregate and transform data.
+
+{XXX}**DB** - These models are directly tied to the Documents in MongoDB
+collections.\
+{XXX}**In** - These models are used for incoming data, such as defining
+the request body for the API endpoint.
+
+{XXX}**Out** - These models are used for defining the data out, such as
+API responses.
+
+#### 1.1.2.2 Use models in the Routes
+
+E.g. Define the response model, the endpoint will automatically cast the
+return object into the model shape
+
+E.g. Define the request body shape. Dataset_in must match the shape of
+the DatasetIn model otherwise it will complain.
+
+```python
+@router.post("", response_model=DatasetOut)
+async def save_dataset(
+        dataset_in: DatasetIn,
+        license_id: str,
+        user=Depends(get_current_user),
+        es: Elasticsearch = Depends(dependencies.get_elasticsearchclient),
+):
+    ...
+    return dataset.dict()
+```
+
+## 1.2 Frontend
+
+### 1.2.1 Components
+
+The frontend consists of various React components, each serving specific
+functions. **Before developing a new component, please review the
+existing ones to see if any can be reused.**
+
+![](devhandbookmedia/image12.png)
+
+#### 1.2.1.1 Reuse Components
+
+Components are often reused. Both Dataset and File use the same
+DisplayMetadata component. The component takes the resourceType as an
+argument, that can be a dataset or file. Reuse of components can save
+time and keep design and function consistent.
+
+```javascript
+import FilesTable from "../files/FilesTable";
+import {MetadataIn} from "../../openapi/v2";
+import {DisplayMetadata} from "../metadata/DisplayMetadata";
+import {DisplayListenerMetadata} from "../metadata/DisplayListenerMetadata";
+import {EditMetadata} from "../metadata/EditMetadata";
+```
+
+Here we see the import of DisplayMetadata. This component is used for
+Files or Datasets. Below we see arguments for resourceId and
+resourceType, which can be file or dataset.
+
+```javascript
+export const DisplayMetadata = (props: MetadataType) => {
+	const {
+		updateMetadata,
+		deleteMetadata,
+		resourceType,
+		resourceId,
+		publicView,
+	} = props;
+```
+
+#### 1.2.1.2 Styled Components
+
+We provide a set of basic Clowder-styled components (e.g., Button,
+Select, Title, Footnote). These can be used just like MUI components,
+with styling controlled here and props still passable. Found those
+components
+[here](https://github.com/clowder-framework/clowder2/tree/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/components/styledComponents).
+
+For example, the ClowderSelect component:
+
+```javascript
+import {ClowderSelect} from "../styledComponents/ClowderSelect";
+
+...
+<FormControl>
+	<ClowderSelect
+		value={String(selectedVersionNum)}
+		defaultValue={"viewer"}
+		onChange={(event) => {
+			setSelectedVersionNum(event.target.value);
+			setSnackBarMessage(`Viewing version ${event.target.value}`);
+			setSnackBarOpen(true);
+		}}
+	>
+		{fileVersions.map((fileVersion) => {
+			return (
+				<MenuItem value={fileVersion.version_num}>
+					{fileVersion.version_num}
+				</MenuItem>
+			);
+		})}
+	</ClowderSelect>
+
+
+````
+
+#### 1.2.1.3 Auth Wrapper
+
+Some components show different things based on user permissions. Here is
+an
+[example](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/components/datasets/Dataset.tsx#L456)
+
+Using `<AuthWrapper/>`. We see that only the **owner**, **editor** or
+**uploader** can have access to the "Add Metadata" component.
+
+```javascript
+<AuthWrapper
+	currRole={datasetRole.role}
+	allowedRoles={["owner", "editor", "uploader"]}
+>
+	<Box textAlign="center">
+		<Button
+			variant="contained"
+			sx={{m: 2}}
+			onClick={() => {
+				setEnableAddMetadata(true);
+			}}
+		>
+			Add Metadata
+		</Button>
+	</Box>
+</AuthWrapper>
+
+```
+
+#### 1.2.1.4 Full Example
+
+Take
+[DisplayMetadata](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/components/metadata/DisplayMetadata.tsx#L31)
+as an example:
+
+```javascript
+export const DisplayMetadata = (props: MetadataType) => {
+	const {
+		updateMetadata,
+		deleteMetadata,
+		resourceType,
+		resourceId,
+		publicView,
+	} = props;
+
+	const dispatch = useDispatch();
+
+	const getMetadatDefinitions = (
+		name: string | null,
+		skip: number,
+		limit: number
+	) => dispatch(fetchMetadataDefinitions(name, skip, limit));
+
+```
+
+[Here](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/components/metadata/DisplayMetadata.tsx#L92-L106)
+we see that whether we have a dataset or file, we use different methods
+to get the metadata. This is how components can be reused. There are
+also options for publicView if the user is not logged in.
+
+```javascript
+useEffect(() => {
+	if (resourceType === "dataset") {
+		if (publicView) {
+			listPublicDatasetMetadata(resourceId);
+		} else {
+			listDatasetMetadata(resourceId);
+		}
+	} else if (resourceType === "file") {
+		if (publicView) {
+			listPublicFileMetadata(resourceId);
+		} else {
+			listFileMetadata(resourceId);
+		}
+	}
+}, [resourceType, resourceId]);
+
+```
+
+These work by [importing
+actions](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/components/metadata/DisplayMetadata.tsx#L5-L12)
+from frontend/actions
+
+```javascript
+import {
+	fetchDatasetMetadata,
+	fetchFileMetadata,
+	fetchMetadataDefinitions,
+	fetchPublicFileMetadata,
+	fetchPublicMetadataDefinitions,
+} from "../../actions/metadata";
+```
+
+And we can see the call in
+[frontend/src/actions/metadata.js](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/actions/metadata.js#L7-L31)
+that calls a method from the Services
+
+```javascript
+export function fetchMetadataDefinitions(name, skip, limit) {
+	return (dispatch) => {
+		return V2.MetadataService.getMetadataDefinitionListApiV2MetadataDefinitionGet(
+			name,
+			skip,
+			limit
+		)
+			.then((json) => {
+				dispatch({
+					type: RECEIVE_METADATA_DEFINITIONS,
+					metadataDefinitionList: json,
+					receivedAt: Date.now(),
+				});
+			})
+			.catch((reason) => {
+				dispatch(
+					handleErrors(reason, fetchMetadataDefinitions(name, skip, limit))
+				);
+			});
+	};
+}
+
+```
+
+And looking at the service in
+[/frontend/src/openapi/v2/MetadataService](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/openapi/v2/services/MetadataService.ts#L26-L43)
+.ts,
+we see it calling the back end routes.
+
+```javascript
+public
+static
+getMetadataDefinitionListApiV2MetadataDefinitionGet(
+	name ? : string,
+	skip ? : number,
+	limit
+:
+number = 2,
+):
+CancelablePromise < Paged > {
+	return __request({
+		method: 'GET',
+		path: `/api/v2/metadata/definition`,
+		query: {
+			'name': name,
+			'skip': skip,
+			'limit': limit,
+		},
+		errors: {
+			422: `Validation Error`,
+		},
+	});
+```
+
+### 1.2.2 Redux
+
+![](devhandbookmedia/image10.png)
+
+- Add an action under the action folder
+  [here](https://github.com/clowder-framework/clowder2/tree/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/actions)
+
+- Update the reducer
+  [here](https://github.com/clowder-framework/clowder2/tree/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/reducers)
+
+- Access the action and state in component use hooks.
+
+```javascript
+
+import {useDispatch, useSelector} from "react-redux";
+
+...
+
+const dispatch = useDispatch();
+const listFileSummary = (fileId: string | undefined) =>
+	dispatch(fetchFileSummary(fileId));
+
+const file = useSelector((state: RootState) => state.file);
+
+```
+
+# 2. Write New Extractors
+
+### 2.1 Components of extractors
+
+<Extractor_name>
+
+- requirements.txt contains the required set of libraries to install
+  (It always need pyclowder, this is library used to connect to
+  Clowder)
+
+```
+pyclowder==3.0.7
+```
+
+- extractor_info.json contains the details about the extractors
+
+```json
+
+{
+  "@context": "http://clowder.ncsa.illinois.edu/contexts/extractors.jsonld",
+  "name": "ncsa.wordcount-3",
+  "version": "2.0",
+  "description": "WordCount extractor. Counts the number of characters, words and lines in the text file that was uploaded.",
+  "author": "Rob Kooper <kooper@illinois.edu>",
+  "contributors": [],
+  "contexts": [
+    {
+      "lines": "http://clowder.ncsa.illinois.edu/metadata/ncsa.wordcount#lines",
+      "words": "http://clowder.ncsa.illinois.edu/metadata/ncsa.wordcount#words",
+      "characters": "http://clowder.ncsa.illinois.edu/metadata/ncsa.wordcount#characters"
+    }
+  ],
+  "repository": [
+    {
+      "repType": "git",
+      "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
+    }
+  ],
+  "process": {
+    "file": [
+      "text/*",
+      "application/json"
+    ]
+  },
+  "external_services": [],
+  "dependencies": [],
+  "bibtex": []
+}
+```
+
+- .py file contains the code for your extractor
+
+```python
+
+class WordCount(Extractor):
+    """Count the number of characters, words and lines in a text file."""
+
+    def __init__(self):
+        Extractor.__init__(self)
+
+        # add any additional arguments to parser
+        # self.parser.add_argument('--max', '-m', type=int, nargs='?', default=-1,
+        #                          help='maximum number (default=-1)')
+
+        # parse command line and load default logging configuration
+        self.setup()
+
+        # setup logging for the extractor
+        logging.getLogger('pyclowder').setLevel(logging.DEBUG)
+        logging.getLogger('__main__').setLevel(logging.DEBUG)
+
+```
+
+- README contains the basic instructions to run the extractor
+
+- **Dockerfile contains a set of instructions to build a Docker image
+  out of the extractor**
+
+More details are [here](https://github.com/clowder-framework/pyclowder)
+about creating an extractor
+
+### 2.2 Starting the extractor
+
+#### 2.2.1 Production mode
+
+- Create Dockerfile and build docker container
+
+- Add to
+  [docker-compose.extractors.yml](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/docker-compose.extractors.yml).
+
+    - Make sure to include default environment variables
+      **CLOWDER_VESERION**, and **RABBITMQ_URI**.
+
+    - Set the networks to **clowder2**
+
+  For example:
+
+```yaml
+sentiment-analysis:
+  image: socialmediamacroscope/sentiment_analysis_extractor:latest
+  environment:
+    CLOWDER_VERSION: 2
+    RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
+  networks:
+    - clowder2
+  restart: unless-stopped
+```
+
+- Run `docker-compose -f docker-compose.yml -f docker-compose.extractors.yml -p clowder-prod up`
+
+#### 2.2.2 Dev mode
+
+Run the main file in your extractor in the IDE, with environment
+parameters set. Similar to above, **CLOWDER_VERSION** and
+**RABBITMQ_URI** are required.
+
+![](devhandbookmedia/image14.png)
+
+Alternatively, using command line
+
+```shell
+export PYTHONUNBUFFERED=1
+export CLOWDER_VERSION=2
+export IMAGE_BINARY=/usr/local/bin/convert
+python run pyclowder/sample-extractors/image-preview-v2/binary_extractor.py
+```
+
+### 2.3 Check if extractor registered
+
+- Log in
+
+- Turn on admin mode
+
+- Go to extractors tab at the side menu, you should be able to see
+  your extractors with information
+
+![](devhandbookmedia/image11.png)
+![](devhandbookmedia/image13.png)
+
+- Go to the file/dataset that are compatible with that extractor.
+  Submit and watch the logs
+
+![](devhandbookmedia/image9.png)
+
+### 2.4 Create Custom Widget submitting to Extractor
+
+#### 2.4.1 Modifying Widget for RSJF
+
+In order to create custom widgets, we need to take the following steps:
+
+- After you created your component make sure, there is an onChange
+  function, this onChange function. The component will use it to set
+  the parameters. In my example, I am creating an Image Annotator, so
+  I need to save the name and points of the annotation
+
+> ![](devhandbookmedia/image2.png)
+>
+> ![](devhandbookmedia/image4.png)
+
+- Create a component in a directory (I use StyledComponents), this
+  offers us to customize the component for the extractor but mainly
+  acts as an intermediary between the rsjf form and the component. The
+  form passes an object which contains a parameter and title that I
+  use to create a title
+
+> ![](devhandbookmedia/image3.png)
+
+#### 2.4.2 Adding to the RSJF
+
+Now the widget is ready for the form, our form for extractors is in the
+file SubmitExtraction.tsx. The steps are:
+
+Import the widget component and add to the widgets object that gives the
+form a map to the different custom widgets
+
+![](devhandbookmedia/image1.png)
+
+In order to map the parameter to the widget, we use the second parameter
+for the form uiSchema. In the extractor-info.json, we give the parameter
+have a property called format that tells the form to map this widget to
+the extractor.
+
+We use a for loop in the file here to go through the parameters and add
+it to the uiSchema if a parameter needs a custom widget
+
+![](devhandbookmedia/image6.png)
+
+#### 2.4.3 In the extractor-info.json
+
+In the extractor json that renders the form, create the parameter that
+can map to this widget. So, since in my case, I use the field
+ImageAnnotator to map to this widget, I create the following
+
+```json
+"parameters": {
+"schema": {
+"Annotations": {
+"type": "object",
+"title": "Annotate image",
+"description": "Annotate image",
+"format": "ImageAnnotator"
+}
+}
+}
+```
+
+When we open the extractor, we should the be able to see the widget,
+
+![](devhandbookmedia/image5.png)
+
+![](devhandbookmedia/image7.png)
+
+When you submit the extractor, you can see the parameters are passed in
+if you extractor script logs the parameters it receives
+
+![](devhandbookmedia/image8.png)
+
+# 3. Custom Visualization Component
+
+You can refer to this PR that adds word cloud visualization as an end to
+end example:
+[https://github.com/clowder-framework/clowder2/pull/786](https://github.com/clowder-framework/clowder2/pull/786)
+
+### 3.1 Create Folder
+
+under [visualization
+folder](https://github.com/clowder-framework/clowder2/tree/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/components/visualizations)
+
+### 3.2 Create the main component
+
+This component could expect 3 props: ***fileId, visualizationId,
+publicView***
+
+***If fileId specified → Raw file bytes (below ) is used to***
+
+***If visualizationId specified → Visualization can be generated by
+(processed) visualization data source***
+
+***If publicView is True → Visualization can be viewed on public
+dataset***
+
+```javascript
+type
+VisProps = {
+	fileId? : string;
+	visualizationId? : string;
+	publicView? : boolean | false;
+};
+
+// E.g.
+export default function Image(props: VisProps) {
+	const {fileId, visualizationId, publicView} = props;
+
+```
+
+### 3.3 Create manifest.json
+
+- Ensure the \"main\" is directed to the component.
+
+- Add visConfig fields, ensuring the \"name\" matches the folder name.
+
+- List the \"mainType\" and \"mimeType\" that the visualization widget
+  supports.
+
+```json
+
+{
+  "name": "vega-spec",
+  "version": "1.0.0",
+  "description": "A simple visualization using vegalite and the spec in json from vis data.",
+  "main": "VegaSpec.tsx",
+  "dependencies": {
+    "clowder2-core": "1.0.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "vega": "^5.20.2"
+  },
+  "visConfig": {
+    "name": "VegaSpec",
+    "mainType": "application",
+    "mimeTypes": [
+      "application/json"
+    ],
+    "fields": []
+  }
+}
+```
+
+### 3.4 Register the component
+
+Add code block in
+[visualization.config.ts](https://github.com/clowder-framework/clowder2/blob/bb35e0b5040443abb847e658ad61f622f189f6bb/frontend/src/visualization.config.ts).
+Place the correct manifest.json
+
+For example:
+
+```javascript
+const configWordCloudSpec = require("./components/visualizations/VegaSpec/manifest.json");
+
+visComponentDefinitions.push({
+	name: configWordCloudSpec.name,
+	mainType: configWordCloudSpec.visConfig.mainType,
+	mimeTypes: configWordCloudSpec.visConfig.mimeTypes,
+	component: React.createElement(registerComponent(configWordCloudSpec)),
+});
+
+```
diff --git a/docs/docs/devs/devhandbookmedia/image1.png b/docs/docs/devs/devhandbookmedia/image1.png
new file mode 100644
index 000000000..58bb030b4
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image1.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image10.png b/docs/docs/devs/devhandbookmedia/image10.png
new file mode 100644
index 000000000..a0167f473
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image10.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image11.png b/docs/docs/devs/devhandbookmedia/image11.png
new file mode 100644
index 000000000..71cdf2a63
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image11.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image12.png b/docs/docs/devs/devhandbookmedia/image12.png
new file mode 100644
index 000000000..ff66e164d
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image12.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image13.png b/docs/docs/devs/devhandbookmedia/image13.png
new file mode 100644
index 000000000..60da05202
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image13.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image14.png b/docs/docs/devs/devhandbookmedia/image14.png
new file mode 100644
index 000000000..da7240f01
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image14.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image2.png b/docs/docs/devs/devhandbookmedia/image2.png
new file mode 100644
index 000000000..97e7d79d2
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image2.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image3.png b/docs/docs/devs/devhandbookmedia/image3.png
new file mode 100644
index 000000000..723ee7a0f
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image3.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image4.png b/docs/docs/devs/devhandbookmedia/image4.png
new file mode 100644
index 000000000..e89ca2e6b
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image4.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image5.png b/docs/docs/devs/devhandbookmedia/image5.png
new file mode 100644
index 000000000..734cffd35
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image5.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image6.png b/docs/docs/devs/devhandbookmedia/image6.png
new file mode 100644
index 000000000..78870d9ef
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image6.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image7.png b/docs/docs/devs/devhandbookmedia/image7.png
new file mode 100644
index 000000000..7400cee80
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image7.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image8.png b/docs/docs/devs/devhandbookmedia/image8.png
new file mode 100644
index 000000000..5bb167b24
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image8.png differ
diff --git a/docs/docs/devs/devhandbookmedia/image9.png b/docs/docs/devs/devhandbookmedia/image9.png
new file mode 100644
index 000000000..9c3d8613e
Binary files /dev/null and b/docs/docs/devs/devhandbookmedia/image9.png differ
diff --git a/docs/docs/devs/devsetup.md b/docs/docs/devs/devsetup.md
new file mode 100644
index 000000000..665cb3c32
--- /dev/null
+++ b/docs/docs/devs/devsetup.md
@@ -0,0 +1,767 @@
+# Clowder V2 Dev Environment Setup
+
+## 1. Explore Github Repository
+
+### 1.1 Prerequisites
+
+- Understanding how git works
+    - For more information, read this [https://www.atlassian.com/git](https://www.atlassian.com/git)
+
+- Create a GitHub Account
+    - If you do not have a GitHub account, create one [https://github.com/signup](https://github.com/signup)
+
+### 1.2 GitHub Basics
+
+- **Repositories** are centralized locations for project files.
+
+- **Issues** are used to track tasks, bugs, and feature requests.
+
+- **Pull** **Requests** **(PRs)**: Proposed changes to a repository.
+
+![](./devsetupmedia/image43.png)
+
+### 1.3 Creating Issues in Clowder2
+
+- Navigate to the Clowder2 repository:
+  [https://github.com/clowder-framework/clowder2/](https://github.com/clowder-framework/clowder2/)
+
+- Click on the \"Issues\" tab.
+
+- Click the \"New issue\" button.
+
+- Fill in the issue template with a descriptive title and detailed
+  description.
+
+- Click \"Submit new issue.\"
+
+- Optional: Decide assignees and pick appropriate labels
+
+![](./devsetupmedia/image30.png)
+![](./devsetupmedia/image38.png)
+![](./devsetupmedia/image17.png)
+
+### 1.4 Creating a Branch Related to an Issue Using GitHub Interface
+
+- Click on the \"Issues\" tab and open the issue for which you want to
+  create a branch.
+
+- On the issue page, under development section on the right side
+  panel, click the \"Create a branch\" link
+
+- In the pop up window, double check if it is the correct repository
+  destination "clowder-framework/clowder2". In rare case, you can
+  create a branch in another clowder affiliated repository
+
+- The default branch will be created based on the "main" branch, but
+  you can change branch source if you would like to branch off a
+  specific branch.
+
+- Once you click the "Create branch" button, a new branch will be
+  created with a name referencing the issue number.
+
+![](./devsetupmedia/image7.png)
+
+### 1.5 Opening a Pull Request (PR) or Draft PR
+
+- Make your code changes and commit them.
+
+    - Using the command line tool, run `git commit -m "<your-commit-message>"`
+    - **Alternatively, you can use PyCharm to commit, which will be covered in the next section.**
+
+- Push the branch to GitHub
+
+    - If using the command line, run `git push origin <branch-name>`
+    - **Alternatively, you can use PyCharm to push, which will be covered in the next section.**
+
+![](./devsetupmedia/image24.png)
+
+- Navigate to the repository on GitHub. Alternatively, use the link
+  provided in the command line after you push your branch.
+
+- Find the \"Pull requests\" tab, then click the \"New pull request\"
+  button.
+
+- Select the correct base branch (the branch to be merged into) and
+  your branch. Review the changes, and if everything looks correct,
+  click the \"Create pull request\" button.
+
+- Fill in the PR template with a descriptive title and detailed
+  description of the changes.
+
+- Appoint reviewers.
+
+- Select \"Create draft pull request\" if your work is not yet
+  complete; otherwise, click \"Create pull request.\"
+
+![](./devsetupmedia/image21.png)
+
+![](./devsetupmedia/image9.png)
+
+![](./devsetupmedia/image18.png)
+
+### 1.6 Review Process
+
+- Once the PR is created, assign other developers for peer review. The
+  PR will also require review from the project maintainers.
+
+- Reviewers should provide feedback and/or approve the changes.
+  Navigate to the "Files changed" tab and click "Review changes"
+  button to provide feedback/
+
+- To provide inline feedback, click on the lines directly.
+
+- The PR author needs to address any feedback by making changes and
+  pushing them to the branch.
+
+- Click \"Resolve conversation\" to indicate that the feedback has
+  been addressed.
+
+- Once approved, AND all the github actions (checks) passed, the PR
+  can be merged into the main branch.
+
+- If there are multiple commits, consider using the \"Squash and
+  merge\" option.
+
+![](./devsetupmedia/image15.png)
+
+![](./devsetupmedia/image32.png)
+
+![](./devsetupmedia/image20.png)
+
+![](./devsetupmedia/image49.png)
+
+## 2. Set up Integrated Development Environment (IDE) (PyCharm)
+
+### 2.1 Download PyCharm
+
+- Download PyCharm Community Edition
+  ([https://www.jetbrains.com/pycharm/download/](https://www.jetbrains.com/pycharm/download/)).
+  It should select the right PyCharm version for your computer.
+
+- Installing PyCharm community edition.
+
+- **If you have access to Professional Edition**, feel free to use
+  that since it has more comprehensive features
+
+### 2.2 Opening the Clowder2 Project in PyCharm
+
+- Clone the Clowder2 GitHub repository project via command line
+  (terminal).
+
+    - On the command line, make sure that you have git installed.
+
+    - Note that on the GitHub page, there is a button 'Code.' Click on
+      that and you will be able to copy the HTTPS link to the Clowder2
+      GitHub repository.
+
+    - The command for cloning is: `git clone https://github.com/clowder-framework/clowder2.git`
+
+- Once cloned, you can click on the 'Open' after you open PyCharm, and
+  navigate to the folder where Clowder2 was cloned and open the
+  project.
+
+![](./devsetupmedia/image40.png)
+
+![](./devsetupmedia/image36.png)
+
+Alternatively
+
+- After you open PyCharm, click on "**Get from VCS**" button
+
+- Select "**Git**" as the version control option and put in the Clowder's GitHub repository URL
+
+- Choose a Directory path which is empty
+
+- Click "Clone"
+
+![](./devsetupmedia/image19.png)
+
+![](./devsetupmedia/image44.png)
+
+### 2.3 Switching to a Branch
+
+Within PyCharm, under Git \> Branches you have the option of either
+creating a branch from the one you are on, or from checking out remote
+branches.
+
+![](./devsetupmedia/image34.png)
+
+### 2.4 Comparing Files Across Branches
+
+PyCharm also allows you to compare files across branches. Click on
+"**Git**" and then "**Current File**" and you can use **"Compare with
+Branch..."** to compare file changes with other branches. "**Fetch**"
+will fetch all remote branches. If you are unable to check out a new
+branch, make sure you run fetch first to bring you up to date with the
+latest changes in the GitHub repository. Also take note of the option
+**"Merge...".** Periodically, you may need to merge the *main* branch
+onto your local development branch to bring the changes that may have
+got merged on the *main* branch.
+
+![](./devsetupmedia/image10.png)
+
+### 2.5 Commit and Push
+
+Below we see options called **"Commit..."** and **"Push..."**. You
+should commit and push your work often (at least daily or after you've
+made significant changes) to make sure that your changes are saved and
+will not be lost. The commits you make will be visible on GitHub, and
+that way other people can test your branch.
+
+![](./devsetupmedia/image14.png)
+
+![](./devsetupmedia/image51.png)
+
+![](./devsetupmedia/image23.png)
+
+## 3. Install Libraries
+
+For our project, we have two main parts: the backend and the frontend.
+
+- **Backend:** We use Python and a framework called
+  [FastAPI](https://fastapi.tiangolo.com/), which helps
+  us create the backend of our application. To run our backend
+  efficiently, we use the
+  [Uvicorn](https://www.uvicorn.org/) server. To manage
+  and install all the necessary tools and libraries for the backend,
+  we use a package manager
+  [Pipenv](https://pipenv.pypa.io/en/latest/).
+
+- **Frontend:** We use [React](https://react.dev/), a
+  popular library for building user interfaces, to create the frontend
+  of our application. The frontend module is developed using
+  TypeScript, React, Material UI, Redux, webpack, Node.js. To manage
+  and install all the tools and libraries needed for the frontend, we
+  use a package manager called
+  [NPM](https://www.npmjs.com/) (Node Package Manager).
+
+### 3.1 Install Backend Dependencies
+
+#### 3.1.1 Python
+
+Install Python [here](https://www.python.org/downloads/). Download the specific architecture version. We recommend
+using Python 3.9
+
+![](./devsetupmedia/image25.png)
+
+Open the downloaded file and follow the installation instructions. After
+the installation, open a terminal or command prompt.
+
+Type `python --version` to check that Python is installed and to see the
+version number.
+
+![](./devsetupmedia/image5.png)
+
+#### 3.1.2 Install Pipenv
+
+`pip install --user pipenv`
+
+Pipenv provides a single, unified interface that allows you to manage
+your Python project dependencies and virtual environments with ease.
+
+- It uses a **Pipfile** to specify the packages you need and a
+  **Pipfile.lock** to lock down the exact versions of these packages
+  to ensure reproducibility.
+
+- It automatically creates and manages a **virtual environment** for
+  your projects, ensuring that your dependencies are isolated from
+  other projects on your mac
+
+We have 2 Pipfiles
+
+- [clowder2/Pipfile](https://github.com/clowder-framework/clowder2/blob/main/Pipfile) -
+  contains the libraries needed for overall app
+
+- [clowder2/backend/Pipfile](https://github.com/clowder-framework/clowder2/blob/main/backend/Pipfile) -
+  contains all libraries specific to backend
+
+#### 3.1.3 Install libraries using pipenv
+
+Below are the steps to set up **backend specific libraries**:
+
+In the PyCharm Terminal you could try below commands to install
+dependencies for Clowder v2:
+
+1. `cd backend` → setup backend environment
+
+2. `pipenv install` → installs all dependencies
+
+![](./devsetupmedia/image6.png)
+
+3. `pipenv install --dev` → installs all dev dependencies
+
+4. `pipenv uninstall <package_name>` → uninstalls the particular
+   dependency
+
+5. `pipenv uninstall ---all` → uninstalls all dependencies
+
+6. To add/update the dependencies version, make sure to update
+   **Pipfile** and run pipenv install
+
+7. For a clean restart, delete **Pipfile.lock** file and run pipenv
+   install
+
+#### 3.1.4 Connect virtual environment in PyCharm
+
+Go to File \> Settings (or PyCharm \> Settings on macOS) \> Project \> Python Interpreter
+>
+![](./devsetupmedia/image46.png)
+
+"Add Interpreter" → "Add Local Interpreter..."
+![](./devsetupmedia/image27.png)
+
+Pick Virtualenv Environment → Pick Existing → **Click the ...**
+![](./devsetupmedia/image35.png)
+
+Find the virtual environment python path.
+
+E.g. My virtual environment python path lives at:
+
+*/Users/cwang138/.virtualenvs/backend-vtWdOmS7/bin/python*
+![](./devsetupmedia/image42.png)
+
+### 3.2 Install Frontend Dependencies
+
+#### 3.2.1 Install Node (and Npm).
+
+Download
+[https://nodejs.org/en/download/package-manager](https://nodejs.org/en/download/package-manager)
+
+We recommend using Node v16.15 LTS.
+
+![](./devsetupmedia/image41.png)
+
+#### 3.2.2 Npm install dependencies
+
+[npm](https://www.npmjs.com/) stands for Node Package
+Manager. It\'s a package manager for JavaScript, and it\'s the default
+package manager for the Node.js runtime environment. It helps developers
+manage and share reusable code packages (modules), making it easier to
+install, remove libraries and dependencies in your projects.
+
+The libraries and dependencies are specified in **package.json** and the
+exact versions are locked down using **package_lock.json.** In addition
+to libraries, you can define scripts under the "script" field in
+package.json.
+
+Here are the links to
+[clowder2/frontend/package.json](https://github.com/clowder-framework/clowder2/blob/main/frontend/package.json)
+and
+[clowder2/frontend/package-lock.json](https://github.com/clowder-framework/clowder2/blob/main/frontend/package-lock.json)
+
+Useful commands to install the dependencies for Clowder frontend :
+
+1. `npm install` → installs all dependencies
+
+![](./devsetupmedia/image26.png)
+
+2. `npm install <package_name>` → install specific dependency
+
+3. `npm uninstall <package_name>` → uninstalls the particular dependency
+
+4. `npm uninstall` → uninstalls all dependencies
+
+5. To add/update the dependencies version, **make sure to update
+   package.json, and run npm install**
+
+6. For a clean restart, delete package-lock.json and node-modules, and
+   run npm install
+
+7. npm run codegen:v2:dev → run this whenever you make any changes in
+   backend classes/functions and that needs to be reflected in frontend
+   classes/functions
+
+> ![](./devsetupmedia/image1.png)
+
+## 4. Set up Docker
+
+[**Docker**](http://docker.com) is a platform that allows you to package
+applications and their dependencies into portable, isolated units called
+containers.
+
+- A docker image is like a blueprint for a container, containing the
+  application code, libraries, and environment settings needed to run
+  the application.
+
+- A docker container is the running instance of a Docker image,
+  providing an isolated environment where the application runs.
+
+![](./devsetupmedia/image47.png)
+
+### 4.1 Installing Docker
+
+- You will need to install docker first, this can be done by following
+  the instructions at:
+
+    - [Install Docker Desktop on Mac](https://docs.docker.com/desktop/install/mac-install/)
+
+    - [Install Docker Desktop on Windows](https://docs.docker.com/desktop/install/windows-install/)
+
+> If the docker desktop shows "Docker Desktop stopped....", you might
+> have to install wsl (windows subsystem linux). This is done using: wsl
+> --install --distribution ubuntu
+
+- [Install Docker Desktop on
+  Linux](https://docs.docker.com/desktop/install/linux-install/)
+
+
+- Once you have installed docker, please see below to test it to make
+  sure it works as expected.
+
+#### *4.1.1 Troubleshooting Docker on Windows (Skip if not applicable)*
+
+*When installing Docker for Windows, please make sure that you have all
+updates installed. When running any of the docker commands, I\'d
+recommend using the powershell (no need for administrator). Main reason
+is that I will use it to get the current working directory, under the
+MS-DOS command you will need to use instead.*
+
+*1. install wsl from powershell with Admin rights: wsl --install and
+reboot your system this will install ubuntu as well after the reboot\
+this can be removed using wsl --unregister ubuntu*
+
+*2. update wsl `wsl -update` and restart wsl `wsl --shutdown`*
+
+*3. check your version `wsl --status`*
+
+#### 4.1.2 Testing Docker Installation
+
+To test your installation you should be able to use the following from
+the command line:
+
+docker run docker/whalesay cowsay Hello World
+
+This should generate the following output:
+
+![](./devsetupmedia/image28.png)
+
+#### 4.1.3 Useful Docker Command Line
+
+The docker application takes a second argument that is indicates what to
+do:
+
+- `docker run` → creates a container from an image and starts the
+  default application in the container. The run command takes
+  additional flags, please look
+  [here](https://docs.docker.com/reference/cli/docker/container/run/)
+  for details..
+
+- `docker images` → are what is used to start a container, these are
+  pulled from a server and contain everything needed to run the application (think a zip file of a linux
+  filesystem).
+
+- `ls` : shows a list of all images you have downloaded.
+
+- `rm` : will remove an image (you can always download it again).
+
+- `docker pull` → will download an image without running it, this is
+  also used to make sure you have the latest image downloaded.
+
+- `docker logs` → shows the output from a container, you can do this
+  after the container is finished, or if the container runs in the
+  background allows you to see the output of the container (think of
+  the tail command in unix).
+
+- `docker rm` → removes a stopped container, this is a cleanup process.
+  You will free up the disk space that the stopped container takes up.
+
+- `docker stop` → stops a container that is running.
+
+### 4.2 Docker Compose Explained
+
+[Docker Compose](https://docs.docker.com/compose/) is a
+tool for defining and running multi-container applications. It is the
+key to unlocking a streamlined and efficient development and deployment
+experience. A
+[docker-compose.yam](https://github.com/clowder-framework/clowder2/blob/main/docker-compose.yml)l
+file is used to define and manage multi-container Docker applications as
+a single service. This file is mainly for production.
+
+#### 4.2.1 For Development
+
+We have a separate
+[docker-compose.dev.yml](https://github.com/clowder-framework/clowder2/blob/main/docker-compose.dev.yml)
+where we have separated the backend and frontend from the other docker
+containers. We run the backend and frontend separately in PyCharm to
+make the development process easy.
+
+#### 4.2.2 Run Clowder Docker Containers
+
+1. `docker-compose -f <docker-compose.dev.yml> -p <clowder2-dev> up
+   -d --build` → create and build all the containers
+
+2. `docker-compose -f <docker-compose.dev.yml> -p <clowder2-dev> down` → stops all containers
+
+**We have a
+[script](https://github.com/clowder-framework/clowder2/blob/main/docker-dev.sh)
+to make it easier:**
+
+**`./docker-dev.sh up` → internally runs the above command 1**
+
+**`./docker-dev.sh down` →internally runs the above command 2**
+
+### 4.3 View Containers in Docker Desktop
+
+![](./devsetupmedia/image11.png)
+
+### *4.4 Delete Storage and Restart (Optional)*
+
+- *If you ever need to delete all the storage data for the containers,
+  please delete all the respective volumes in the docker desktops (see
+  screenshots).*
+
+- *Alternatively, you can use the command line to run `docker-compose
+  -f <docker-compose.dev.yml> -p <clowder2-dev> down -v`*
+
+- *After volumes have been successfully removed, run the docker
+  compose up command to start over.*
+
+![](./devsetupmedia/image4.png)
+
+## 5. Run/Debug Clowder2 Full Stack
+
+By following these steps, you can start both the frontend and backend,
+along with the necessary Docker containers, and run the Clowder 2 stacks
+using PyCharm.
+
+### 5.1 Start Docker Dependencies
+
+Ensure that the necessary dependencies are running. This includes
+**Elasticsearch, MongoDB, RabbitMQ, extractor heartbeat listeners,
+and/or extractors**. Use the following command to start them
+
+`sh docker-dev.sh up`
+
+(Details please refer to previous section: [Run Clowder Docker
+Containers](#run-clowder-docker-containers))
+
+Verify that the dependencies are running by running: `docker ps`
+
+### 5.2 Run Clowder 2 Backend
+
+In PyCharm, navigate to the left panel where you will see the "Run"
+menu (located between "Refactor" and "Tools"). This menu contains
+all the configurations needed to run Clowder.
+
+**Select and Run Configuration:** On the right side of the PyCharm
+interface, you will see the name of your selected run configuration.
+Next to it, there are buttons for running the configuration. Ensure that
+uvicorn is selected. The run button is represented by an arrow.
+
+![](./devsetupmedia/image29.png)
+
+To run the backend, choose **'uvicorn'** under the run/debug
+configurations and choose run.
+
+![](./devsetupmedia/image13.png)
+
+### 5.3 Run Clowder 2 Frontend
+
+To run the front end, run the **'npm start:dev'** configuration. **After
+that, Clowder2 should open up at localhost:3000 in your browser.\
+**![](./devsetupmedia/image2.png)
+
+### 5.4 Debugging using PyCharm
+
+#### 5.4.1 Debugging the Backend
+
+- Debugging the backend is almost the same as running. Simply choose
+  **debug** instead of run. **Set breakpoints** somewhere in the
+  backend code and PyCharm will stop at those breakpoints.
+
+#### 5.4.2 Debugging the Frontend
+
+- Make sure you have a running backend first
+
+- Make sure to run the frontend as instructed in the above section.
+
+- Additionally, set up "**Javascript Debug**" and run in "**Debug**"
+  mode
+
+- **This will open a new browser window.** In order to debug the front
+  end, you must use **the new browser** window that opens up. The
+  original one opened by the usual run config will not have any
+  effect. Then you can put breakpoints in the front end and will stop
+  when they are reached.
+
+![](./devsetupmedia/image3.png)
+
+Here is a screenshot of what you would see in the backend debug mode
+when a breakpoint is reached. You can see the method that we are in
+along with the values.
+
+![](./devsetupmedia/image12.png)
+
+Here\'s a look at what you would see when debugging the frontend
+JavaScript. In this example, we\'re examining the \`**useEffect**\`
+method within the main thread. The debugger shows the current
+\`**datasetId**\` and \`**folderId**\`.
+
+![](./devsetupmedia/image16.png)
+
+## 6. Pre-commits
+
+Pre-commit hooks are used to identify and fix simple code issues before
+submission to code review, allowing reviewers to focus on more
+significant architectural changes. Clowder2 pre-commit hooks include
+below automatic formatting and checks:
+
+- Python style checks and formatting using **black, isort, and
+  flake8**.
+
+- Custom script to create openapi.json file from the backend FastAPI
+  app.
+
+- Eslint and prettier for frontend code.
+
+### 6.1 Install Pre-commit Hooks
+
+- Run pip install pre-commit to install pre-commit.
+
+- Navigate to the **root directory of the repository** and run
+  pre-commit install to install the pre-commit hooks.
+
+### 6.2 Automatic Hook Execution
+
+- The hooks will run automatically on every commit.
+
+- If any of the hooks fail, the commit will be aborted.
+
+- Hooks are stored in the .git/hooks directory and will be in place
+  for all future commits and branches.
+
+![](./devsetupmedia/image50.png)
+
+### 6.3 Manual Hook Execution
+
+- To run the hooks manually, use `pre-commit run --all-files` in the
+  command line. You should see a list of checks. If any fail, please
+  investigate the issues and fix them accordingly.
+
+![](./devsetupmedia/image31.png)
+
+### 6.4 Skipping Hooks (Not recommended)
+
+- To skip the hooks, use `git commit --no-verify` or in PyCharm, click
+  on the cog icon in the PyCharm commit interface and uncheck \"Run
+  Git hooks\".
+
+## 7. Optional
+
+### 7.1 Visual Studio Code (VS Code)
+
+Feel free to use Visual Studio Code if you're already familiar with it.
+Like Pycharm, VS Code is a free, lightweight, and powerful code editor.
+It supports a wide range of programming languages and comes with
+features like syntax highlighting, debugging, version control
+integration, and extensions to enhance functionality. If you haven\'t
+already, download and install Visual Studio Code from the [official
+website](https://code.visualstudio.com/).
+
+### 7.2 Setup Github CoPilot with VS Code
+
+If you have [Github
+CoPilot](https://github.com/features/copilot/), you can
+integrate it with VS Code and it can help you generate a lot of the
+coding.
+
+#### 7.2.1 Step 1: Install GitHub Copilot Extension
+
+- Open VS Code.
+
+- Go to Extensions View:
+
+    - Click on the Extensions icon in the Activity Bar on the side of
+      the window, or press Ctrl+Shift+X (Windows/Linux) or Cmd+Shift+X
+      (macOS).
+
+> ![](./devsetupmedia/image33.png)
+
+- Search for GitHub Copilot:
+
+    - In the search bar, type GitHub Copilot.
+
+- Install the Extension:
+
+    - Click on the Install button next to the GitHub Copilot
+      extension.
+
+![](./devsetupmedia/image22.png)
+
+#### 7.2.2 Step 2: Sign in to GitHub
+
+1. Open Command Palette:
+
+- Press Ctrl+Shift+P (Windows/Linux) or Cmd+Shift+P (macOS) to open
+  the Command Palette.
+
+![](./devsetupmedia/image37.png)
+
+2. Sign In:
+
+- Type GitHub: Sign in and select the option.
+
+- Follow the prompts to sign in with your GitHub account.
+
+#### 7.2.3 Step 3: Enable GitHub Copilot
+
+1. Open Command Palette:
+
+    - Press Ctrl+Shift+P (Windows/Linux) or Cmd+Shift+P (macOS).
+
+2. Enable Copilot:
+
+    - Type GitHub Copilot: Enable and select the option.
+
+#### 7.2.4 Step 4: Start Using GitHub Copilot
+
+- Open a file: Open a file in a supported language (e.g., Python,
+  JavaScript).
+
+- Begin typing: As you type, GitHub Copilot will provide suggestions.
+  You can accept suggestions by pressing Tabor Enter.
+
+> ![](./devsetupmedia/image39.png)
+>
+> ![](./devsetupmedia/image8.png)
+>
+> ![](./devsetupmedia/image45.png)
+
+### 7.3 Browser inspect mode
+
+The inspect mode gives access to a list of tools that collectively help
+developers diagnose and fix issues, optimize performance, and ensure the
+best user experience. Let's take Chrome for example:
+
+#### 7.3.1 Accessing Inspect Mode
+
+- Right-click on a webpage and select \"Inspect\" from the context
+  menu.
+
+- Alternatively, press `Ctrl+Shift+I` (Windows/Linux) or
+  `Cmd+Option+I` (Mac).
+
+![](./devsetupmedia/image48.png)
+
+#### 7.3.2 Elements Tab
+
+- View and modify the HTML structure and CSS styles of a webpage.
+
+- Hover over elements to see their dimensions and applied styles.
+
+- Edit HTML or CSS directly and see changes in real-time.
+
+#### 7.3.3 Console Tab
+
+- Useful for debugging scripts and interacting with the page's
+  JavaScript context.
+
+#### 7.3.4 Network Tab
+
+- Monitor network activity and inspect requests and responses.
+
+- Filter requests by type (e.g., FETCH/XHR, JS, CSS, Images) to focus
+  on specific resources.
+
+- Click each entry to view detailed information about each request,
+  such as headers, payload, and timing.
diff --git a/docs/docs/devs/devsetupmedia/image1.png b/docs/docs/devs/devsetupmedia/image1.png
new file mode 100644
index 000000000..72653089d
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image1.png differ
diff --git a/docs/docs/devs/devsetupmedia/image10.png b/docs/docs/devs/devsetupmedia/image10.png
new file mode 100644
index 000000000..4c8fe4843
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image10.png differ
diff --git a/docs/docs/devs/devsetupmedia/image11.png b/docs/docs/devs/devsetupmedia/image11.png
new file mode 100644
index 000000000..f5c3ca9d4
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image11.png differ
diff --git a/docs/docs/devs/devsetupmedia/image12.png b/docs/docs/devs/devsetupmedia/image12.png
new file mode 100644
index 000000000..6899e9435
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image12.png differ
diff --git a/docs/docs/devs/devsetupmedia/image13.png b/docs/docs/devs/devsetupmedia/image13.png
new file mode 100644
index 000000000..04b057611
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image13.png differ
diff --git a/docs/docs/devs/devsetupmedia/image14.png b/docs/docs/devs/devsetupmedia/image14.png
new file mode 100644
index 000000000..fb80ee90c
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image14.png differ
diff --git a/docs/docs/devs/devsetupmedia/image15.png b/docs/docs/devs/devsetupmedia/image15.png
new file mode 100644
index 000000000..374af4f30
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image15.png differ
diff --git a/docs/docs/devs/devsetupmedia/image16.png b/docs/docs/devs/devsetupmedia/image16.png
new file mode 100644
index 000000000..12ed56ffe
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image16.png differ
diff --git a/docs/docs/devs/devsetupmedia/image17.png b/docs/docs/devs/devsetupmedia/image17.png
new file mode 100644
index 000000000..03d68f906
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image17.png differ
diff --git a/docs/docs/devs/devsetupmedia/image18.png b/docs/docs/devs/devsetupmedia/image18.png
new file mode 100644
index 000000000..7cb3a3953
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image18.png differ
diff --git a/docs/docs/devs/devsetupmedia/image19.png b/docs/docs/devs/devsetupmedia/image19.png
new file mode 100644
index 000000000..2d33e2350
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image19.png differ
diff --git a/docs/docs/devs/devsetupmedia/image2.png b/docs/docs/devs/devsetupmedia/image2.png
new file mode 100644
index 000000000..1a3b7deec
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image2.png differ
diff --git a/docs/docs/devs/devsetupmedia/image20.png b/docs/docs/devs/devsetupmedia/image20.png
new file mode 100644
index 000000000..1c2cffd3c
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image20.png differ
diff --git a/docs/docs/devs/devsetupmedia/image21.png b/docs/docs/devs/devsetupmedia/image21.png
new file mode 100644
index 000000000..ebbb2d9d2
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image21.png differ
diff --git a/docs/docs/devs/devsetupmedia/image22.png b/docs/docs/devs/devsetupmedia/image22.png
new file mode 100644
index 000000000..c123ef9be
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image22.png differ
diff --git a/docs/docs/devs/devsetupmedia/image23.png b/docs/docs/devs/devsetupmedia/image23.png
new file mode 100644
index 000000000..62fbfa65f
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image23.png differ
diff --git a/docs/docs/devs/devsetupmedia/image24.png b/docs/docs/devs/devsetupmedia/image24.png
new file mode 100644
index 000000000..63264bceb
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image24.png differ
diff --git a/docs/docs/devs/devsetupmedia/image25.png b/docs/docs/devs/devsetupmedia/image25.png
new file mode 100644
index 000000000..7cd668f70
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image25.png differ
diff --git a/docs/docs/devs/devsetupmedia/image26.png b/docs/docs/devs/devsetupmedia/image26.png
new file mode 100644
index 000000000..e09cae279
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image26.png differ
diff --git a/docs/docs/devs/devsetupmedia/image27.png b/docs/docs/devs/devsetupmedia/image27.png
new file mode 100644
index 000000000..537377fc0
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image27.png differ
diff --git a/docs/docs/devs/devsetupmedia/image28.png b/docs/docs/devs/devsetupmedia/image28.png
new file mode 100644
index 000000000..47482eb8e
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image28.png differ
diff --git a/docs/docs/devs/devsetupmedia/image29.png b/docs/docs/devs/devsetupmedia/image29.png
new file mode 100644
index 000000000..994004d33
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image29.png differ
diff --git a/docs/docs/devs/devsetupmedia/image3.png b/docs/docs/devs/devsetupmedia/image3.png
new file mode 100644
index 000000000..4196f9346
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image3.png differ
diff --git a/docs/docs/devs/devsetupmedia/image30.png b/docs/docs/devs/devsetupmedia/image30.png
new file mode 100644
index 000000000..56123bef9
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image30.png differ
diff --git a/docs/docs/devs/devsetupmedia/image31.png b/docs/docs/devs/devsetupmedia/image31.png
new file mode 100644
index 000000000..865ce2ddf
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image31.png differ
diff --git a/docs/docs/devs/devsetupmedia/image32.png b/docs/docs/devs/devsetupmedia/image32.png
new file mode 100644
index 000000000..599bf53e7
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image32.png differ
diff --git a/docs/docs/devs/devsetupmedia/image33.png b/docs/docs/devs/devsetupmedia/image33.png
new file mode 100644
index 000000000..323a50565
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image33.png differ
diff --git a/docs/docs/devs/devsetupmedia/image34.png b/docs/docs/devs/devsetupmedia/image34.png
new file mode 100644
index 000000000..36f28378b
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image34.png differ
diff --git a/docs/docs/devs/devsetupmedia/image35.png b/docs/docs/devs/devsetupmedia/image35.png
new file mode 100644
index 000000000..f2a3a39bb
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image35.png differ
diff --git a/docs/docs/devs/devsetupmedia/image36.png b/docs/docs/devs/devsetupmedia/image36.png
new file mode 100644
index 000000000..640263845
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image36.png differ
diff --git a/docs/docs/devs/devsetupmedia/image37.png b/docs/docs/devs/devsetupmedia/image37.png
new file mode 100644
index 000000000..acf381455
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image37.png differ
diff --git a/docs/docs/devs/devsetupmedia/image38.png b/docs/docs/devs/devsetupmedia/image38.png
new file mode 100644
index 000000000..806a8b7b3
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image38.png differ
diff --git a/docs/docs/devs/devsetupmedia/image39.png b/docs/docs/devs/devsetupmedia/image39.png
new file mode 100644
index 000000000..ebf3da3c0
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image39.png differ
diff --git a/docs/docs/devs/devsetupmedia/image4.png b/docs/docs/devs/devsetupmedia/image4.png
new file mode 100644
index 000000000..d654ab1f0
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image4.png differ
diff --git a/docs/docs/devs/devsetupmedia/image40.png b/docs/docs/devs/devsetupmedia/image40.png
new file mode 100644
index 000000000..1098b4d51
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image40.png differ
diff --git a/docs/docs/devs/devsetupmedia/image41.png b/docs/docs/devs/devsetupmedia/image41.png
new file mode 100644
index 000000000..79951afc5
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image41.png differ
diff --git a/docs/docs/devs/devsetupmedia/image42.png b/docs/docs/devs/devsetupmedia/image42.png
new file mode 100644
index 000000000..d47c0401d
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image42.png differ
diff --git a/docs/docs/devs/devsetupmedia/image43.png b/docs/docs/devs/devsetupmedia/image43.png
new file mode 100644
index 000000000..675ca030d
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image43.png differ
diff --git a/docs/docs/devs/devsetupmedia/image44.png b/docs/docs/devs/devsetupmedia/image44.png
new file mode 100644
index 000000000..25a5515df
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image44.png differ
diff --git a/docs/docs/devs/devsetupmedia/image45.png b/docs/docs/devs/devsetupmedia/image45.png
new file mode 100644
index 000000000..128f45a88
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image45.png differ
diff --git a/docs/docs/devs/devsetupmedia/image46.png b/docs/docs/devs/devsetupmedia/image46.png
new file mode 100644
index 000000000..90df72f43
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image46.png differ
diff --git a/docs/docs/devs/devsetupmedia/image47.png b/docs/docs/devs/devsetupmedia/image47.png
new file mode 100644
index 000000000..34bfbfa6b
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image47.png differ
diff --git a/docs/docs/devs/devsetupmedia/image48.png b/docs/docs/devs/devsetupmedia/image48.png
new file mode 100644
index 000000000..45f94c333
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image48.png differ
diff --git a/docs/docs/devs/devsetupmedia/image49.png b/docs/docs/devs/devsetupmedia/image49.png
new file mode 100644
index 000000000..ecad2bbee
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image49.png differ
diff --git a/docs/docs/devs/devsetupmedia/image5.png b/docs/docs/devs/devsetupmedia/image5.png
new file mode 100644
index 000000000..893ee0de1
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image5.png differ
diff --git a/docs/docs/devs/devsetupmedia/image50.png b/docs/docs/devs/devsetupmedia/image50.png
new file mode 100644
index 000000000..83e3ea9b3
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image50.png differ
diff --git a/docs/docs/devs/devsetupmedia/image51.png b/docs/docs/devs/devsetupmedia/image51.png
new file mode 100644
index 000000000..2d42dc34d
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image51.png differ
diff --git a/docs/docs/devs/devsetupmedia/image6.png b/docs/docs/devs/devsetupmedia/image6.png
new file mode 100644
index 000000000..f3a10c03f
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image6.png differ
diff --git a/docs/docs/devs/devsetupmedia/image7.png b/docs/docs/devs/devsetupmedia/image7.png
new file mode 100644
index 000000000..a820180e9
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image7.png differ
diff --git a/docs/docs/devs/devsetupmedia/image8.png b/docs/docs/devs/devsetupmedia/image8.png
new file mode 100644
index 000000000..b99976e00
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image8.png differ
diff --git a/docs/docs/devs/devsetupmedia/image9.png b/docs/docs/devs/devsetupmedia/image9.png
new file mode 100644
index 000000000..d523166e4
Binary files /dev/null and b/docs/docs/devs/devsetupmedia/image9.png differ
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 9cabe4e1e..7f88ca003 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -8,16 +8,20 @@ nav:
       - Visualizations: users/visualizations.md
   - Developers:
       - Getting started: devs/getstarted.md
+      - Development Environment Setup: devs/devsetup.md
+      - Development Handbook: devs/devhandbook.md
       - Architecture: devs/architecture.md
       - Frontend:
         - devs/frontend/lazyloading.md
       - Keycloak: devs/keycloak.md
-      - Metadata: devs/metadata.md
       - Mongo: devs/mongo-fastapi.md
       - PyCharm: devs/pycharm.md
       - Elasticsearch: devs/elasticsearch.md
-      - Listeners: devs/listeners.md
       - Standalone Docker Deployment: devs/standalone-docker-deployment.md
+      - Design Docs:
+          - Listeners: devs/listeners.md
+          - Metadata: devs/metadata.md
+          - Dataset Versioning: devs/dataset-versioning.md
       - Proposals:
         - Storage: devs/storage.md
   - Admins:
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f04b9abb1..b064b8d5a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,7 +1,7 @@
 {
 	"name": "clowder-frontend",
-	"version": "2.0.0-beta.2",
-	"lockfileVersion": 3,
+	"version": "2.0.0-beta.3",
+	"lockfileVersion": 1,
 	"requires": true,
 	"packages": {
 		"": {
diff --git a/frontend/package.json b/frontend/package.json
index a06899a63..e0e448cac 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "clowder-frontend",
-	"version": "2.0.0-beta.2",
+	"version": "2.0.0-beta.3",
 	"description": "",
 	"engines": {
 		"npm": ">=8.11",
diff --git a/frontend/src/app.config.ts b/frontend/src/app.config.ts
index 7c325852c..feeac410e 100644
--- a/frontend/src/app.config.ts
+++ b/frontend/src/app.config.ts
@@ -42,7 +42,7 @@ const hostname =
 
 // TODO when add auth piece remove this env
 const apikey = process.env.APIKEY || "";
-config["appVersion"] = "v2.0.0-beta.2";
+config["appVersion"] = "v2.0.0-beta.3";
 config["mailingList"] = "clowder@lists.illinois.edu";
 config["slackChannel"] =
 	"https://join.slack.com/t/clowder-software/shared_invite/enQtMzQzOTg0Nzk3OTUzLTYwZDlkZDI0NGI4YmI0ZjE5MTZiYmZhZTIyNWE1YzM0NWMwMzIxODNhZTA1Y2E3MTQzOTg1YThiNzkwOWQwYWE";
diff --git a/frontend/src/components/Explore.tsx b/frontend/src/components/Explore.tsx
index fea232ac9..765fd5f6a 100644
--- a/frontend/src/components/Explore.tsx
+++ b/frontend/src/components/Explore.tsx
@@ -109,8 +109,10 @@ export const Explore = (): JSX.Element => {
 												created={dataset.created}
 												description={dataset.description}
 												thumbnailId={dataset.thumbnail_id}
+												publicView={false}
 												frozen={dataset.frozen}
 												frozenVersionNum={dataset.frozen_version_num}
+												status={dataset.status}
 											/>
 										</Grid>
 									);
diff --git a/frontend/src/components/Public.tsx b/frontend/src/components/Public.tsx
index a0cbecb24..e371e517e 100644
--- a/frontend/src/components/Public.tsx
+++ b/frontend/src/components/Public.tsx
@@ -96,6 +96,7 @@ export const Public = (): JSX.Element => {
 												publicView={true}
 												frozen={dataset.frozen}
 												frozenVersionNum={dataset.frozen_version_num}
+												status={dataset.status}
 											/>
 										</Grid>
 									);
diff --git a/frontend/src/components/datasets/Dataset.tsx b/frontend/src/components/datasets/Dataset.tsx
index d193d0a02..0636c767b 100644
--- a/frontend/src/components/datasets/Dataset.tsx
+++ b/frontend/src/components/datasets/Dataset.tsx
@@ -526,7 +526,7 @@ export const Dataset = (): JSX.Element => {
 								: TabStyle
 						}
 					>
-						<Listeners datasetId={datasetId} />
+						<Listeners datasetId={datasetId} process="dataset" />
 					</TabPanel>
 					<TabPanel value={selectedTabIndex} index={4}>
 						<ExtractionHistoryTab datasetId={datasetId} />
diff --git a/frontend/src/components/datasets/DatasetCard.tsx b/frontend/src/components/datasets/DatasetCard.tsx
index 622f50aa9..29c0c78cc 100644
--- a/frontend/src/components/datasets/DatasetCard.tsx
+++ b/frontend/src/components/datasets/DatasetCard.tsx
@@ -15,6 +15,7 @@ import {
 import { Download } from "@mui/icons-material";
 import { generateThumbnailUrl } from "../../utils/visualization";
 import config from "../../app.config";
+import Chip from "@mui/material/Chip";
 
 type DatasetCardProps = {
 	id?: string;
@@ -24,8 +25,9 @@ type DatasetCardProps = {
 	description?: string;
 	thumbnailId?: string;
 	publicView?: boolean | false;
-	frozen?: string;
+	frozen?: boolean;
 	frozenVersionNum?: number;
+	status?: string;
 };
 
 export default function DatasetCard(props: DatasetCardProps) {
@@ -39,6 +41,7 @@ export default function DatasetCard(props: DatasetCardProps) {
 		publicView,
 		frozen,
 		frozenVersionNum,
+		status,
 	} = props;
 
 	const [thumbnailUrl, setThumbnailUrl] = useState("");
@@ -130,16 +133,32 @@ export default function DatasetCard(props: DatasetCardProps) {
 						<Download />
 					</IconButton>
 				</Tooltip>
-				{/*<Tooltip title="Favorite">*/}
-				{/*	<IconButton color="primary" aria-label="favorite"  sx={{mr: 3}} disabled>*/}
-				{/*		<Favorite/>*/}
-				{/*	</IconButton>*/}
-				{/*</Tooltip>*/}
-				{/*<Tooltip title="Share">*/}
-				{/*	<IconButton color="primary" aria-label="share"  sx={{mr: 3}} disabled>*/}
-				{/*		<Share/>*/}
-				{/*	</IconButton>*/}
-				{/*</Tooltip>*/}
+				{(() => {
+					switch (status) {
+						case "PUBLIC":
+							return (
+								<Tooltip title="Anyone on the internet can access this dataset">
+									<Chip
+										label={status?.toLowerCase()}
+										color="primary"
+										size="small"
+									/>
+								</Tooltip>
+							);
+						case "PRIVATE":
+							return (
+								<Tooltip title="Only users given specific permissions can access this dataset">
+									<Chip
+										label={status?.toLowerCase()}
+										color="primary"
+										size="small"
+									/>
+								</Tooltip>
+							);
+						default:
+							return null;
+					}
+				})()}
 			</CardActions>
 		</Card>
 	);
diff --git a/frontend/src/components/datasets/PublicDatasetCard.tsx b/frontend/src/components/datasets/PublicDatasetCard.tsx
index a3c8c8f4c..4ebf5e0a2 100644
--- a/frontend/src/components/datasets/PublicDatasetCard.tsx
+++ b/frontend/src/components/datasets/PublicDatasetCard.tsx
@@ -16,6 +16,8 @@ import { Download } from "@mui/icons-material";
 import { generateThumbnailUrl } from "../../utils/visualization";
 import config from "../../app.config";
 // import {Favorite, Share} from "@material-ui/icons";
+import PublicIcon from "@mui/icons-material/Public";
+import Chip from "@mui/material/Chip";
 
 type PublicDatasetCardProps = {
 	id?: string;
@@ -27,11 +29,20 @@ type PublicDatasetCardProps = {
 	publicView?: boolean | false;
 	frozen?: boolean | false;
 	frozenVersionNum?: number;
+	status?: string;
 };
 
 export default function PublicDatasetCard(props: PublicDatasetCardProps) {
-	const { id, name, author, created, description, thumbnailId, publicView } =
-		props;
+	const {
+		id,
+		name,
+		author,
+		created,
+		description,
+		thumbnailId,
+		publicView,
+		status,
+	} = props;
 
 	const [thumbnailUrl, setThumbnailUrl] = useState("");
 
@@ -111,27 +122,16 @@ export default function PublicDatasetCard(props: PublicDatasetCardProps) {
 					</CardContent>
 				</CardActionArea>
 			)}
-			<CardActions sx={{ pb: 0, justifyContent: "space-between" }}>
+			<CardActions sx={{ pb: 0, pr: 0 }}>
 				<Tooltip title="Download">
 					<IconButton
 						href={`${config.hostname}/api/v2/public_datasets/${id}/download`}
 						color="primary"
 						aria-label="download"
-						sx={{ mr: 3 }}
 					>
 						<Download />
 					</IconButton>
 				</Tooltip>
-				{/*<Tooltip title="Favorite">*/}
-				{/*	<IconButton color="primary" aria-label="favorite"  sx={{mr: 3}} disabled>*/}
-				{/*		<Favorite/>*/}
-				{/*	</IconButton>*/}
-				{/*</Tooltip>*/}
-				{/*<Tooltip title="Share">*/}
-				{/*	<IconButton color="primary" aria-label="share"  sx={{mr: 3}} disabled>*/}
-				{/*		<Share/>*/}
-				{/*	</IconButton>*/}
-				{/*</Tooltip>*/}
 			</CardActions>
 		</Card>
 	);
diff --git a/frontend/src/components/datasets/ShareDatasetModal.tsx b/frontend/src/components/datasets/ShareDatasetModal.tsx
index 13063ec7d..ec57ecdcb 100644
--- a/frontend/src/components/datasets/ShareDatasetModal.tsx
+++ b/frontend/src/components/datasets/ShareDatasetModal.tsx
@@ -85,34 +85,11 @@ export default function ShareDatasetModal(props: ShareDatasetModalProps) {
 	}, [users, myProfile.email]);
 
 	const onShare = async () => {
-		setShowFailAlert(false);
-		setShowSuccessAlert(false);
 		await setUserRole(datasetId, email, role);
+		// setGroup({ label: "", id: "" });
+		setRole("viewer");
+		setShowSuccessAlert(true);
 		getRoles(datasetId);
-		const currentRoles = datasetRoles;
-		// TODO check for roles
-		let found_user = false;
-		if (currentRoles !== undefined && currentRoles.user_roles !== undefined) {
-			currentRoles.user_roles.map((currentRole) => {
-				if (currentRole.user.email === email) {
-					if (currentRole.role.toString() === role.toString()) {
-						found_user = true;
-					}
-				}
-			});
-		}
-		if (found_user) {
-			setEmail("");
-			setRole("viewer");
-			setShowFailAlert(false);
-			setShowSuccessAlert(true);
-			getRoles(datasetId);
-		} else {
-			setEmail("");
-			setRole("viewer");
-			setShowFailAlert(true);
-			getRoles(datasetId);
-		}
 	};
 
 	return (
diff --git a/frontend/src/components/files/File.tsx b/frontend/src/components/files/File.tsx
index 53853f788..d381f39c0 100644
--- a/frontend/src/components/files/File.tsx
+++ b/frontend/src/components/files/File.tsx
@@ -411,7 +411,7 @@ export const File = (): JSX.Element => {
 								: TabStyle
 						}
 					>
-						<Listeners fileId={fileId} datasetId={datasetId} process={"file"} />
+						<Listeners fileId={fileId} datasetId={datasetId} process="file" />
 					</TabPanel>
 					<TabPanel value={selectedTabIndex} index={4}>
 						<ExtractionHistoryTab fileId={fileId} />
diff --git a/frontend/src/components/listeners/ExtractionHistoryTab.tsx b/frontend/src/components/listeners/ExtractionHistoryTab.tsx
index a5f4a7b94..1b7ad794b 100644
--- a/frontend/src/components/listeners/ExtractionHistoryTab.tsx
+++ b/frontend/src/components/listeners/ExtractionHistoryTab.tsx
@@ -1,148 +1,42 @@
 import React, { useEffect, useState } from "react";
 
-import { useDispatch, useSelector } from "react-redux";
-import { RootState } from "../../types/data";
+import { useDispatch } from "react-redux";
 import { fetchListenerJobs } from "../../actions/listeners";
 import { ExtractionJobs } from "./ExtractionJobs";
 import { format } from "date-fns";
-import { parseDate } from "../../utils/common";
 
-const createData = (
-	status: string,
-	jobId: string,
-	listener_id: string,
-	created: string,
-	creator: string,
-	duration: number
-) => {
-	return {
-		status,
-		listener_id,
-		jobId,
-		created,
-		creator,
-		duration,
-	};
-};
-
-const headCells = [
-	{
-		id: "status",
-		label: "",
-	},
-	{
-		id: "listener_id",
-		label: "Extractor Name",
-	},
-	{
-		id: "jobId",
-		label: "Job ID",
-	},
-	{
-		id: "created",
-		label: "Submitted At",
-	},
-	{
-		id: "creator",
-		label: "Submitted By",
-	},
-	{
-		id: "duration",
-		label: "Duration",
-	},
-];
 export const ExtractionHistoryTab = (props): JSX.Element => {
 	const { datasetId, fileId } = props;
 
 	const dispatch = useDispatch();
-	const listListenerJobs = (
-		listenerId: string | null,
-		status: string | null,
-		userId: string | null,
-		fileId: string | null,
-		datasetId: string | null,
-		created: string | null,
-		skip: number,
-		limit: number
-	) =>
-		dispatch(
-			fetchListenerJobs(
-				listenerId,
-				status,
-				userId,
-				fileId,
-				datasetId,
-				created,
-				skip,
-				limit
-			)
-		);
-
-	const jobs = useSelector((state: RootState) => state.listener.jobs);
 
-	const [executionJobsTableRow, setExecutionJobsTableRow] = useState([]);
 	const [selectedStatus, setSelectedStatus] = useState(null);
 	const [selectedCreatedTime, setSelectedCreatedTime] = useState(null);
 
-	useEffect(() => {
-		listListenerJobs(
-			null,
-			null,
-			null,
-			fileId ? fileId : null,
-			datasetId ? datasetId : null,
-			null,
-			0,
-			100
-		);
-	}, []);
-
-	const handleRefresh = () => {
-		listListenerJobs(
-			null,
-			selectedStatus,
-			null,
-			fileId ? fileId : null,
-			datasetId ? datasetId : null,
-			selectedCreatedTime ? format(selectedCreatedTime, "yyyy-MM-dd") : null,
-			0,
-			100
-		);
-	};
-
 	useEffect(() => {
 		// TODO add pagination for jobs
-		handleRefresh();
-	}, [selectedStatus, selectedCreatedTime]);
-
-	useEffect(() => {
-		const rows = [];
-		if (jobs.length > 0) {
-			jobs.map((job) => {
-				rows.push(
-					createData(
-						job["status"],
-						job["id"],
-						job["listener_id"],
-						parseDate(job["created"]),
-						job["creator"]["email"],
-						`${job["duration"]} sec`
-					)
-				);
-			});
-		}
-		setExecutionJobsTableRow(rows);
-	}, [jobs]);
+		dispatch(
+			fetchListenerJobs(
+				null,
+				selectedStatus,
+				null,
+				fileId,
+				datasetId,
+				selectedCreatedTime ? format(selectedCreatedTime, "yyyy-MM-dd") : null,
+				0,
+				100
+			)
+		);
+	}, [selectedStatus, selectedCreatedTime, dispatch]);
 
 	return (
 		<ExtractionJobs
-			rows={executionJobsTableRow}
-			headCells={headCells}
 			selectedStatus={selectedStatus}
 			selectedCreatedTime={selectedCreatedTime}
 			setSelectedStatus={setSelectedStatus}
 			setSelectedCreatedTime={setSelectedCreatedTime}
-			handleRefresh={handleRefresh}
+			fileId={fileId}
+			datasetId={datasetId}
 		/>
 	);
 };
diff --git a/frontend/src/components/listeners/ExtractionJobs.tsx b/frontend/src/components/listeners/ExtractionJobs.tsx
index 352559c8c..198db0367 100644
--- a/frontend/src/components/listeners/ExtractionJobs.tsx
+++ b/frontend/src/components/listeners/ExtractionJobs.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ChangeEvent, useEffect, useState } from "react";
+import { ChangeEvent, useEffect } from "react";
 import Box from "@mui/material/Box";
 import Table from "@mui/material/Table";
 import TableBody from "@mui/material/TableBody";
@@ -33,7 +33,6 @@ import { useDispatch, useSelector } from "react-redux";
 import { RootState } from "../../types/data";
 import { format } from "date-fns";
 import { parseDate } from "../../utils/common";
-import { EventListenerJobOut } from "../../openapi/v2";
 
 export interface Data {
 	status: string;
@@ -61,7 +60,7 @@ const headCells = [
 	},
 	{
 		id: "created",
-		label: "Submitted At",
+		label: "Submitted On",
 	},
 	{
 		id: "creator",
@@ -81,28 +80,6 @@ const headCells = [
 	},
 ];
 
-const createData = (
-	status: string,
-	jobId: string,
-	listenerName: string,
-	created: string,
-	creator: string,
-	duration: number,
-	resourceType: string,
-	resourceId: string
-) => {
-	return {
-		status,
-		jobId,
-		listenerName,
-		created,
-		creator,
-		duration,
-		resourceType,
-		resourceId,
-	};
-};
-
 function descendingComparator<T>(a: T, b: T, orderBy: keyof T) {
 	if (b[orderBy] < a[orderBy]) {
 		return -1;
@@ -151,6 +128,8 @@ export const ExtractionJobs = (props) => {
 		setSelectedStatus,
 		setSelectedCreatedTime,
 		selectedExtractor,
+		fileId,
+		datasetId,
 	} = props;
 
 	const dispatch = useDispatch();
@@ -190,77 +169,35 @@ export const ExtractionJobs = (props) => {
 	const [limit, setLimit] = React.useState(config.defaultExtractionJobs);
 	const [openExtractorPane, setOpenExtractorPane] = React.useState(false);
 	const [jobId, setJobId] = React.useState("");
-	const [rows, setRows] = useState([]);
-
-	useEffect(() => {
-		// reset to first currPageNum
-		setCurrPageNum(1);
-		listListenerJobs(null, null, null, null, null, null, 0, limit);
-	}, [adminMode]);
-
-	useEffect(() => {
-		// reset to first currPageNum
-		setCurrPageNum(1);
-		if (selectedExtractor) {
-			listListenerJobs(
-				selectedExtractor["name"],
-				null,
-				null,
-				null,
-				null,
-				null,
-				0,
-				limit
-			);
-			// clear filters
-			setSelectedStatus(null);
-			setSelectedCreatedTime(null);
-		}
-	}, [selectedExtractor]);
 
 	useEffect(() => {
-		// reset to first currPageNum
 		setCurrPageNum(1);
 		listListenerJobs(
 			selectedExtractor ? selectedExtractor["name"] : null,
 			selectedStatus,
 			null,
-			null,
-			null,
+			fileId ? fileId : null,
+			datasetId ? datasetId : null,
 			selectedCreatedTime ? format(selectedCreatedTime, "yyyy-MM-dd") : null,
 			0,
 			limit
 		);
-	}, [selectedStatus, selectedCreatedTime]);
-
-	useEffect(() => {
-		const rows = [];
-		if (jobs && jobs.length > 0) {
-			jobs.map((job: EventListenerJobOut) => {
-				rows.push(
-					createData(
-						job["status"],
-						job["id"],
-						job["listener_id"],
-						parseDate(job["created"]),
-						job["creator"]["email"],
-						`${job["duration"]} sec`,
-						job["resource_ref"]["collection"],
-						job["resource_ref"]["resource_id"]
-					)
-				);
-			});
-		}
-		setRows(rows);
-	}, [jobs]);
+	}, [
+		adminMode,
+		selectedExtractor,
+		selectedStatus,
+		selectedCreatedTime,
+		limit,
+		dispatch,
+	]);
 
 	const handleRefresh = () => {
 		listListenerJobs(
 			selectedExtractor ? selectedExtractor["name"] : null,
 			selectedStatus,
 			null,
-			null,
-			null,
+			fileId ? fileId : null,
+			datasetId ? datasetId : null,
 			selectedCreatedTime ? format(selectedCreatedTime, "yyyy-MM-dd") : null,
 			(currPageNum - 1) * limit,
 			limit
@@ -283,8 +220,8 @@ export const ExtractionJobs = (props) => {
 			selectedExtractor ? selectedExtractor["name"] : null,
 			selectedStatus ? selectedStatus : null,
 			null,
-			null,
-			null,
+			fileId ? fileId : null,
+			datasetId ? datasetId : null,
 			selectedCreatedTime ? format(selectedCreatedTime, "yyyy-MM-dd") : null,
 			newSkip,
 			limit
@@ -303,8 +240,8 @@ export const ExtractionJobs = (props) => {
 			selectedExtractor ? selectedExtractor["name"] : null,
 			selectedStatus ? selectedStatus : null,
 			null,
-			null,
-			null,
+			fileId ? fileId : null,
+			datasetId ? datasetId : null,
 			selectedCreatedTime ? format(selectedCreatedTime, "yyyy-MM-dd") : null,
 			0,
 			newRowsPerPage
@@ -338,7 +275,7 @@ export const ExtractionJobs = (props) => {
 				</Dialog>
 				<TableContainer>
 					<ExtractionJobsToolbar
-						numExecution={rows.length}
+						numExecution={jobs.length}
 						selectedStatus={selectedStatus}
 						selectedCreatedTime={selectedCreatedTime}
 						setSelectedStatus={setSelectedStatus}
@@ -357,58 +294,60 @@ export const ExtractionJobs = (props) => {
 							headCells={headCells}
 						/>
 						<TableBody>
-							{stableSort(rows, getComparator(order, orderBy)).map((row) => {
+							{stableSort(jobs, getComparator(order, orderBy)).map((job) => {
 								return (
-									<TableRow key={row.jobId}>
+									<TableRow key={job.id}>
 										<TableCell
 											align="right"
 											sx={{ color: theme.palette.primary.main }}
 										>
-											{row.status === config.eventListenerJobStatus.created ? (
+											{job.status === config.eventListenerJobStatus.created ? (
 												<AddCircleOutlineIcon />
 											) : null}
-											{row.status ===
+											{job.status ===
 											config.eventListenerJobStatus.resubmitted ? (
 												<RestartAltIcon />
 											) : null}
-											{row.status === config.eventListenerJobStatus.started ? (
+											{job.status === config.eventListenerJobStatus.started ? (
 												<PlayCircleOutlineIcon />
 											) : null}
-											{row.status ===
+											{job.status ===
 											config.eventListenerJobStatus.processing ? (
 												<AccessTimeIcon />
 											) : null}
-											{row.status ===
+											{job.status ===
 											config.eventListenerJobStatus.succeeded ? (
 												<CheckCircleIcon />
 											) : null}
-											{row.status === config.eventListenerJobStatus.error ? (
+											{job.status === config.eventListenerJobStatus.error ? (
 												<CancelIcon />
 											) : null}
-											{row.status === config.eventListenerJobStatus.skipped ? (
+											{job.status === config.eventListenerJobStatus.skipped ? (
 												<SkipNextIcon />
 											) : null}
 										</TableCell>
-										{Object.keys(row).map((key) => {
-											if (key == "jobId") {
-												return (
-													<TableCell align="left">
-														<Link
-															component="button"
-															variant="body2"
-															onClick={() => {
-																setJobId(row[key]);
-																handleExtractionSummary();
-															}}
-														>
-															{row[key]}
-														</Link>
-													</TableCell>
-												);
-											}
-											if (key !== "status")
-												return <TableCell align="left">{row[key]}</TableCell>;
-										})}
+										<TableCell align="left">
+											<Link
+												component="button"
+												variant="body2"
+												onClick={() => {
+													setJobId(job.id);
+													handleExtractionSummary();
+												}}
+											>
+												{job.id}
+											</Link>
+										</TableCell>
+										<TableCell align="left">{job.listener_id}</TableCell>
+										<TableCell align="left">{parseDate(job.created)}</TableCell>
+										<TableCell align="left">{job.creator.email}</TableCell>
+										<TableCell align="left">{job.duration} seconds</TableCell>
+										<TableCell align="left">
+											{job.resource_ref.collection}
+										</TableCell>
+										<TableCell align="left">
+											{job.resource_ref.resource_id}
+										</TableCell>
 									</TableRow>
 								);
 							})}
diff --git a/frontend/src/components/listeners/ExtractionJobsToolbar.tsx b/frontend/src/components/listeners/ExtractionJobsToolbar.tsx
index 9b63f883f..bfac9e832 100644
--- a/frontend/src/components/listeners/ExtractionJobsToolbar.tsx
+++ b/frontend/src/components/listeners/ExtractionJobsToolbar.tsx
@@ -72,7 +72,7 @@ export const ExtractionJobsToolbar = (props: ExtractionJobsToolbarProps) => {
 				</FormControl>
 				<LocalizationProvider dateAdapter={AdapterDateFns}>
 					<DatePicker
-						label="Submitted at"
+						label="Submitted on"
 						value={selectedCreatedTime}
 						onChange={(value) => {
 							setSelectedCreatedTime(value);
diff --git a/frontend/src/components/listeners/Feeds.tsx b/frontend/src/components/listeners/Feeds.tsx
index 416fbb44f..1c340a15f 100644
--- a/frontend/src/components/listeners/Feeds.tsx
+++ b/frontend/src/components/listeners/Feeds.tsx
@@ -5,9 +5,6 @@ import {
 	Dialog,
 	DialogContent,
 	DialogTitle,
-	Divider,
-	FormControl,
-	FormControlLabel,
 	Grid,
 	IconButton,
 	Pagination,
@@ -31,7 +28,6 @@ import { Link } from "react-router-dom";
 import DeleteIcon from "@mui/icons-material/Delete";
 import { ErrorModal } from "../errors/ErrorModal";
 import DeleteFeedModal from "./DeleteFeedModal";
-import { EditFeedModal } from "./EditFeedModal";
 import { CreateFeedModal } from "./CreateFeedModal";
 
 export function Feeds() {
@@ -129,15 +125,17 @@ export function Feeds() {
 				<Grid container>
 					<Grid item xs={8} />
 					<Grid item xs={4}>
-						<Button
-							variant="contained"
-							onClick={() => {
-								setCreateFeedModalOpen(true);
-							}}
-							sx={{ float: "right" }}
-						>
-							Create New Feed
-						</Button>
+						{adminMode ? (
+							<Button
+								variant="contained"
+								onClick={() => {
+									setCreateFeedModalOpen(true);
+								}}
+								sx={{ float: "right" }}
+							>
+								Create New Feed
+							</Button>
+						) : null}
 					</Grid>
 				</Grid>
 				<Grid container spacing={2} paddingBottom={"16px"}>
diff --git a/frontend/src/components/metadata/DisplayMetadata.tsx b/frontend/src/components/metadata/DisplayMetadata.tsx
index ad27b50f8..1650c174f 100644
--- a/frontend/src/components/metadata/DisplayMetadata.tsx
+++ b/frontend/src/components/metadata/DisplayMetadata.tsx
@@ -39,6 +39,7 @@ export const DisplayMetadata = (props: MetadataType) => {
 
 	const dispatch = useDispatch();
 
+	// metadata definitions
 	const getMetadatDefinitions = (
 		name: string | null,
 		skip: number,
@@ -49,12 +50,15 @@ export const DisplayMetadata = (props: MetadataType) => {
 		skip: number,
 		limit: number
 	) => dispatch(fetchPublicMetadataDefinitions(name, skip, limit));
+
 	const metadataDefinitionList = useSelector(
 		(state: RootState) => state.metadata.metadataDefinitionList.data
 	);
 	const publicMetadataDefinitionList = useSelector(
 		(state: RootState) => state.metadata.publicMetadataDefinitionList
 	);
+
+	// metadata values
 	const listDatasetMetadata = (datasetId: string | undefined) =>
 		dispatch(fetchDatasetMetadata(datasetId));
 	const listFileMetadata = (fileId: string | undefined) =>
@@ -63,6 +67,7 @@ export const DisplayMetadata = (props: MetadataType) => {
 		dispatch(fetchPublicDatasetMetadata(datasetId));
 	const listPublicFileMetadata = (fileId: string | undefined) =>
 		dispatch(fetchPublicFileMetadata(fileId));
+
 	const datasetMetadataList = useSelector(
 		(state: RootState) => state.metadata.datasetMetadataList
 	);
@@ -78,18 +83,17 @@ export const DisplayMetadata = (props: MetadataType) => {
 	const publicFileMetadataList = useSelector(
 		(state: RootState) => state.metadata.publicFileMetadataList
 	);
+
+	// about
 	const about = useSelector((state: RootState) => state.dataset.about);
 
+	// complete metadata list with both definition and values
 	useEffect(() => {
 		if (publicView) {
 			getPublicMetadatDefinitions(null, 0, 100);
 		} else {
 			getMetadatDefinitions(null, 0, 100);
 		}
-	}, []);
-
-	// complete metadata list with both definition and values
-	useEffect(() => {
 		if (resourceType === "dataset") {
 			if (publicView) {
 				listPublicDatasetMetadata(resourceId);
@@ -103,7 +107,7 @@ export const DisplayMetadata = (props: MetadataType) => {
 				listFileMetadata(resourceId);
 			}
 		}
-	}, [resourceType, resourceId]);
+	}, [resourceType, resourceId, dispatch]);
 
 	return (
 		<>
diff --git a/frontend/src/components/visualizations/PublicVisualization.tsx b/frontend/src/components/visualizations/PublicVisualization.tsx
index 847cb848e..7c4311a93 100644
--- a/frontend/src/components/visualizations/PublicVisualization.tsx
+++ b/frontend/src/components/visualizations/PublicVisualization.tsx
@@ -111,7 +111,9 @@ export const PublicVisualization = (props: previewProps) => {
 			{/* 1. load all the visualization components and its definition available to the frontend */}
 			{visComponentDefinitions.map((visComponentDefinition) => {
 				return (
-					<LazyLoadErrorBoundary fallback={<div>Fail to load...</div>}>
+					<LazyLoadErrorBoundary
+						fallback={<div>Visualization failed to load...</div>}
+					>
 						<Suspense fallback={<div>Loading...</div>}>
 							{(() => {
 								// 2. looking for visualization configuration registered for this resource
diff --git a/frontend/src/components/visualizations/Visualization.tsx b/frontend/src/components/visualizations/Visualization.tsx
index dd9dc0dc1..cddea9005 100644
--- a/frontend/src/components/visualizations/Visualization.tsx
+++ b/frontend/src/components/visualizations/Visualization.tsx
@@ -107,7 +107,9 @@ export const Visualization = (props: previewProps) => {
 			{/* 1. load all the visualization components and its definition available to the frontend */}
 			{visComponentDefinitions.map((visComponentDefinition) => {
 				return (
-					<LazyLoadErrorBoundary fallback={<div>Fail to load...</div>}>
+					<LazyLoadErrorBoundary
+						fallback={<div>Visualization failed to load...</div>}
+					>
 						<Suspense fallback={<div>Loading...</div>}>
 							{(() => {
 								// 2. looking for visualization configuration registered for this resource
diff --git a/frontend/src/openapi/v2/core/OpenAPI.ts b/frontend/src/openapi/v2/core/OpenAPI.ts
index cdf38cb7d..473413160 100644
--- a/frontend/src/openapi/v2/core/OpenAPI.ts
+++ b/frontend/src/openapi/v2/core/OpenAPI.ts
@@ -20,7 +20,7 @@ type Config = {
 
 export const OpenAPI: Config = {
     BASE: '',
-    VERSION: '2.0.0-beta.2',
+    VERSION: '2.0.0-beta.3',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',
     TOKEN: undefined,
diff --git a/frontend/src/openapi/v2/index.ts b/frontend/src/openapi/v2/index.ts
index 7644abf9d..495cccc76 100644
--- a/frontend/src/openapi/v2/index.ts
+++ b/frontend/src/openapi/v2/index.ts
@@ -78,6 +78,7 @@ export type { UserAPIKeyOut } from './models/UserAPIKeyOut';
 export type { UserIn } from './models/UserIn';
 export type { UserLogin } from './models/UserLogin';
 export type { UserOut } from './models/UserOut';
+export type { UserUpdate } from './models/UserUpdate';
 export type { ValidationError } from './models/ValidationError';
 export type { VisualizationConfigIn } from './models/VisualizationConfigIn';
 export type { VisualizationConfigOut } from './models/VisualizationConfigOut';
diff --git a/frontend/src/openapi/v2/models/UserUpdate.ts b/frontend/src/openapi/v2/models/UserUpdate.ts
new file mode 100644
index 000000000..ec7bb5422
--- /dev/null
+++ b/frontend/src/openapi/v2/models/UserUpdate.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type UserUpdate = {
+    first_name?: string;
+    last_name?: string;
+    password?: string;
+}
diff --git a/frontend/src/openapi/v2/services/AuthService.ts b/frontend/src/openapi/v2/services/AuthService.ts
index 1eb40a4d2..052cdc67d 100644
--- a/frontend/src/openapi/v2/services/AuthService.ts
+++ b/frontend/src/openapi/v2/services/AuthService.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { UserIn } from '../models/UserIn';
+import type { UserLogin } from '../models/UserLogin';
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { request as __request } from '../core/request';
 
@@ -40,7 +40,7 @@ export class AuthService {
      * @throws ApiError
      */
     public static loginPostApiV2AuthLoginPost(
-        requestBody: UserIn,
+        requestBody: UserLogin,
     ): CancelablePromise<any> {
         return __request({
             method: 'POST',
diff --git a/frontend/src/openapi/v2/services/LoginService.ts b/frontend/src/openapi/v2/services/LoginService.ts
index 4be660baa..dfee3ec59 100644
--- a/frontend/src/openapi/v2/services/LoginService.ts
+++ b/frontend/src/openapi/v2/services/LoginService.ts
@@ -4,6 +4,7 @@
 import type { UserIn } from '../models/UserIn';
 import type { UserLogin } from '../models/UserLogin';
 import type { UserOut } from '../models/UserOut';
+import type { UserUpdate } from '../models/UserUpdate';
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { request as __request } from '../core/request';
 
@@ -49,6 +50,26 @@ export class LoginService {
         });
     }
 
+    /**
+     * Update Current User
+     * @param requestBody
+     * @returns UserOut Successful Response
+     * @throws ApiError
+     */
+    public static updateCurrentUserApiV2UsersMePatch(
+        requestBody: UserUpdate,
+    ): CancelablePromise<UserOut> {
+        return __request({
+            method: 'PATCH',
+            path: `/api/v2/users/me`,
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                422: `Validation Error`,
+            },
+        });
+    }
+
     /**
      * Get Admin
      * @param datasetId
diff --git a/openapi.json b/openapi.json
index 2f1283f74..902ccca97 100644
--- a/openapi.json
+++ b/openapi.json
@@ -11,7 +11,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "version": "2.0.0-beta.2"
+    "version": "2.0.0-beta.3"
   },
   "paths": {
     "/api/v2/users": {
@@ -156,6 +156,58 @@
         }
       }
     },
+    "/api/v2/users/me": {
+      "patch": {
+        "tags": [
+          "login"
+        ],
+        "summary": "Update Current User",
+        "operationId": "update_current_user_api_v2_users_me_patch",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserUpdate"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserOut"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HTTPValidationError"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "OAuth2AuthorizationCodeBearer": []
+          },
+          {
+            "APIKeyHeader": []
+          },
+          {
+            "APIKeyCookie": []
+          }
+        ]
+      }
+    },
     "/api/v2/users/me/is_admin": {
       "get": {
         "tags": [
@@ -11912,7 +11964,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UserIn"
+                "$ref": "#/components/schemas/UserLogin"
               }
             }
           },
@@ -14500,7 +14552,7 @@
           "version": {
             "title": "Version",
             "type": "string",
-            "default": "2.0.0-beta.2"
+            "default": "2.0.0-beta.3"
           }
         }
       },
@@ -14736,6 +14788,24 @@
         },
         "description": "Document Mapping class.\n\nFields:\n\n- `id` - MongoDB document ObjectID \"_id\" field.\nMapped to the PydanticObjectId class\n\nInherited from:\n\n- Pydantic BaseModel\n- [UpdateMethods](https://roman-right.github.io/beanie/api/interfaces/#aggregatemethods)"
       },
+      "UserUpdate": {
+        "title": "UserUpdate",
+        "type": "object",
+        "properties": {
+          "first_name": {
+            "title": "First Name",
+            "type": "string"
+          },
+          "last_name": {
+            "title": "Last Name",
+            "type": "string"
+          },
+          "password": {
+            "title": "Password",
+            "type": "string"
+          }
+        }
+      },
       "ValidationError": {
         "title": "ValidationError",
         "required": [