diff --git a/docs/reference/concepts/01-evaluation-api.mdx b/docs/reference/concepts/01-evaluation-api.mdx
index 9cf0ba9c..63f14c6d 100644
--- a/docs/reference/concepts/01-evaluation-api.mdx
+++ b/docs/reference/concepts/01-evaluation-api.mdx
@@ -130,7 +130,7 @@ Integer intValue = client.getIntegerValue("intFlag", 1);
 Double doubleValue = client.getDoubleValue("doubleFlag", 0.9);
 
 // get an object value
-MyObject objectValue = client.getObjectValue<MyObject>("objectFlag", MyObjectInstance);
+Value objectValue = client.getObjectValue("objectFlag", MyObjectInstance);
 ```
 
 </TabItem>
@@ -213,19 +213,19 @@ const objectDetails = await client.getObjectDetails<MyObject>('objectFlag', {});
 
 ```java
 // get details of boolean evaluation
-Boolean boolValue = client.getBooleanDetails("boolFlag", false);
+FlagEvaluationDetails<Boolean> boolDetails = client.getBooleanDetails("boolFlag", false);
 
 // get details of string evaluation
-String stringValue = client.getStringDetails("stringFlag", "default");
+FlagEvaluationDetails<String> stringDetails = client.getStringDetails("stringFlag", "default");
 
 // get details of integer evaluation
-Integer intValue = client.getIntegerDetails("intFlag", 1);
+FlagEvaluationDetails<Integer> intDetails = client.getIntegerDetails("intFlag", 1);
 
 // get details of double evaluation
-Double doubleValue = client.getDoubleDetails("doubleFlag", .9);
+FlagEvaluationDetails<Doulbe> doubleDetails = client.getDoubleDetails("doubleFlag", .9);
 
 // get details of object evaluation
-MyObject objectValue = client.getObjectDetails<MyObject>("objectFlag", myObjectDefaultInstance);
+FlagEvaluationDetails<Value> objectDetails = client.getObjectDetails<MyObject>("objectFlag", myObjectDefaultInstance);
 ```
 
 </TabItem>
diff --git a/docs/reference/concepts/02-provider.mdx b/docs/reference/concepts/02-provider.mdx
index 22962e8c..63bec9d0 100644
--- a/docs/reference/concepts/02-provider.mdx
+++ b/docs/reference/concepts/02-provider.mdx
@@ -108,12 +108,15 @@ export class MyFeatureProvider implements Provider {
 ```java
 package dev.openfeature.javasdk;
 
-import lombok.Getter;
-
 public class MyFeatureProvider implements FeatureProvider {
-    @Getter
+
     private final String name = "My Feature Provider";
 
+    @Override
+    public String getName() {
+      return this.name;
+    }
+
     @Override
     public Metadata getMetadata() {
         return new Metadata() {
diff --git a/docs/reference/concepts/03-evaluation-context.mdx b/docs/reference/concepts/03-evaluation-context.mdx
index a18a8041..81c6c2b6 100644
--- a/docs/reference/concepts/03-evaluation-context.mdx
+++ b/docs/reference/concepts/03-evaluation-context.mdx
@@ -38,14 +38,14 @@ const boolValue = await client.getBooleanValue('boolFlag', false, context);
 ```java
 // add a value to the global context
 OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-api.setEvaluationContext(new EvaluationContext().add("myGlobalKey", "myGlobalValue"));
+api.setEvaluationContext(new MutableContext().add("myGlobalKey", "myGlobalValue"));
 
 // add a value to the client context
 Client client = api.getClient();
-client.setEvaluationContext(new EvaluationContext().add("myClientKey", "myClientValue"));
+client.setEvaluationContext(new MutableContext().add("myClientKey", "myClientValue"));
 
 // add a value to the invocation context
-EvaluationContext context = new EvaluationContext();
+EvaluationContext context = new MutableContext();
 context.addStringAttribute("myInvocationKey", "myInvocationValue")
 Boolean boolValue = client.getBooleanValue("boolFlag", false, context);
 ```
diff --git a/src/components/custom/SvgOrFonticon/index.tsx b/src/components/custom/SvgOrFonticon/index.tsx
index f293cd97..4bc59f02 100644
--- a/src/components/custom/SvgOrFonticon/index.tsx
+++ b/src/components/custom/SvgOrFonticon/index.tsx
@@ -2,7 +2,6 @@ import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { IconDefinition as BrandsIconDefinition } from '@fortawesome/free-brands-svg-icons';
 import { faCode, IconDefinition as FreeIconDefinition } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import clsx from 'clsx';
 import React, { ComponentType, SVGProps } from 'react';
 import styles from './styles.module.css';