diff --git a/.idea/misc.xml b/.idea/misc.xml
index 14613fe5e03b18ddd991ae2d6469785815981a8c..ba18a6c33941ef11eae66cf92f7dc410afae5c27 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Allergy.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Allergy.java
index e6cb6fe6a4b0fe364ddc41bda866a034117eaadb..a602e31dff0344c2b605b33d796a7f968bc42da5 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Allergy.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Allergy.java
@@ -3,17 +3,25 @@ package ntnu.idatt2016.v233.SmartMat.entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
- * This is a record class representing an allergy
+ * Allergy is an entity class representing an allergy
  * 
- * @author Stian Lyng
- * @version 1.1
+ * @author Stian Lyng and Anders
+ * @version 1.1.001
+ * @since 19.04.2023
  *
- * @param name The name of the allergy
- * @param description The description of the allergy
  */
-@Entity
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity(name = "allergy")
+@Data
 public class Allergy{
 
     @Id
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java
index 9ed00112ff05b4b8bd497fb6aaf69557935397bd..7bf5a77ebb962c52c539d0b576cf4310f98e1496 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Fridge.java
@@ -1,18 +1,25 @@
 package ntnu.idatt2016.v233.SmartMat.entity;
 
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
- * Fridge is a record class representing a fridge in the system.
+ * Fridge is an entity class representing a fridge in the system.
  *
  * @author Anders
- * @version 1.1
- * @since 05.04.2023
+ * @version 1.1.001
+ * @since 19.04.2023
  *
- * @param fridgeId
- * @param groupId
  */
-@Entity
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity(name = "fridge")
+@Data
 public class Fridge{
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java
index 6d861cf3658c9be2278be8fa291464a91361820d..197f41ae42bb382b1f517d3e4f7a37f4b7132866 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java
@@ -1,19 +1,25 @@
 package ntnu.idatt2016.v233.SmartMat.entity;
 
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
- * Recipe is a record class representing a recipe in the system.
+ * Recipe is an entity class representing a recipe in the system.
  *
  * @author Anders
- * @version 1.0
- * @since 04.04.2023
+ * @version 1.0.001
+ * @since 19.04.2023
  *
- * @param id
- * @param name
- * @param description
  */
-@Entity
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity(name = "recipe")
+@Data
 public class Recipe {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
index 75af5c09467f78df4bae7d43b3e8c353c90ea667..f206ff4a2ed7c26b460dba43e22472b067c6206e 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
@@ -2,17 +2,25 @@ package ntnu.idatt2016.v233.SmartMat.entity;
 
 
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * This class represents a shopping list
  * 
- * @author Stian Lyng
- * @version 1.0
+ * @author Stian Lyng and Anders
+ * @version 1.0.001
+ * @since 19.04.2023
  *
- * @param ShoppingListID the id of the shopping list
- * @param GroupID the id of the groupID
  */
-@Entity
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity(name = "shoppinglist")
+@Data
 public class ShoppingList {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java
index 670469612cb76826f961a065db448b39765f325d..56b8c27b8358532818b38cfc25fe03310d43ed86 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java
@@ -6,15 +6,18 @@ import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
- * Product is a record class representing a product in the system.
+ * Product is an entity class representing a product in the system.
  * All other info about the product is fetched from api call on fronted.
  * this ensures that the product is always up to date.
- * @author Birk
- * @version 1.1
- * @since 05.04.2023
+ * @author Birk and Anders
+ * @version 1.1.001
+ * @since 19.04.2023
  */
+@NoArgsConstructor
+@AllArgsConstructor
 @Builder
 @Entity(name = "product")
 @Data
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/request/LoginRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/request/LoginRequest.java
index b59f9b13027f4e654d8fa81d13f61e3f927d118d..8cc2c9e7310233c962d751505187b9bfc2edce63 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/request/LoginRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/request/LoginRequest.java
@@ -5,7 +5,7 @@ package ntnu.idatt2016.v233.SmartMat.entity.request;
  *
  * @author Anders
  * @version 1.0
- * @since 04.04.2023
+ * @since 18.04.2023
  *
  * @param username
  * @param password
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/Authority.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/Authority.java
index d624a01318775326a5fa20a80f2dcc8045efa260..0c5551c96c07f3a6122c9f3f4046e8a55d819965 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/Authority.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/Authority.java
@@ -5,10 +5,8 @@ package ntnu.idatt2016.v233.SmartMat.entity.user;
  *
  * @author Birk
  * @version 2.0
- * @since 05.04.2023
+ * @since 19.04.2023
  *
- * @param username The username of the user.
- * @param authority The authority of the user.
  */
 public enum Authority{
     USER,
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
index 2ea88151d76f9f89b89451d7632703a40e59aa85..0d4163c27db4472f6eddf7cd15f202fe97975976 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
@@ -2,7 +2,9 @@ package ntnu.idatt2016.v233.SmartMat.entity.user;
 
 
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.NoArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -15,13 +17,14 @@ import java.util.List;
  * It implements the UserDetails interface.
  *
  * @author Anders and Birk
- * @version 2.0
- * @since 05.04.2023
+ * @version 2.0.001
+ * @since 19.04.2023
  *
  */
+@NoArgsConstructor
+@AllArgsConstructor
 @Entity(name = "users")
 @Builder
-
 public class User implements UserDetails {
     @Id
     @Column(name = "user_name")