diff --git a/src/main/java/com/gamedoora/model/dao/IssueHistory.java b/src/main/java/com/gamedoora/model/dao/IssueHistory.java
index 999c3af1..d0b12c26 100644
--- a/src/main/java/com/gamedoora/model/dao/IssueHistory.java
+++ b/src/main/java/com/gamedoora/model/dao/IssueHistory.java
@@ -23,7 +23,7 @@
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor
-@Table(name = "issue history")
+@Table(name = "issue_history")
 public class IssueHistory {
 
     @Id
diff --git a/src/main/java/com/gamedoora/model/dao/ProjectUser.java b/src/main/java/com/gamedoora/model/dao/ProjectUser.java
index 9c877aba..d2459377 100644
--- a/src/main/java/com/gamedoora/model/dao/ProjectUser.java
+++ b/src/main/java/com/gamedoora/model/dao/ProjectUser.java
@@ -30,16 +30,12 @@ public class ProjectUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
+    @GeneratedValue
     @Column(name = "Id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
 
     @ManyToOne
     @JoinColumn(name = "user_id")
     Users users;
 
-//    @ManyToOne
-//    @JoinColumn(name = "project_id")
-//    Projects projects;
-// testing
 }
diff --git a/src/main/java/com/gamedoora/model/dao/Users.java b/src/main/java/com/gamedoora/model/dao/Users.java
index 5e49b4f9..a5cc2a14 100644
--- a/src/main/java/com/gamedoora/model/dao/Users.java
+++ b/src/main/java/com/gamedoora/model/dao/Users.java
@@ -1,77 +1,68 @@
 package com.gamedoora.model.dao;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.UniqueConstraint;
+import lombok.*;
+
+import javax.persistence.*;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
 @Builder
+@Getter
+@Setter
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor
-@Table(name = "users", uniqueConstraints = @UniqueConstraint(columnNames = "emailId"))
+@Table(name = "users", uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
 public class Users extends Audit implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	@Column(name = "provider_token", nullable = false)
 	String providerToken;
 
 	@Id
-	@Column(name = "emailId", nullable = false)
-	String emailId;
+	@Column(name = "user_id", nullable = false)
+	private String emailId;
 
 	@Column(name = "first_name")
-	String firstName;
+	private String firstName;
 
 	@Column(name = "last_name")
-	String lastName;
+	private String lastName;
 
 	@Column(name = "provider_id")
-	long providerId;
+	private long providerId;
 
 	@Column(name = "password")
-	String password;
+	private String password;
 
 	@Column(name = "sign_in_count")
-	int signInCount;
+	private int signInCount;
 
 	@Column(name = "session_token")
-	String sessionToken;
+	private String sessionToken;
 
 	@Column(name = "reset_password_token")
-	String resetPasswordToken;
+	private String resetPasswordToken;
 
 	@Column(name = "photo_url")
-	String photoUrl;
+	private String photoUrl;
 
 	@Column(name = "phone_number")
-	String phoneNumber;
+	private String phoneNumber;
 
 	@Column(name = "last_sign_in")
 	@Temporal(TemporalType.TIMESTAMP)
 	Date lastSignIn;
 
 	@Column(name = "last_sign_ip")
-	String lastSignIp;
+	private String lastSignIp;
 
 	@Column(name = "current_sign_ip")
-	String currentSignIp;
+	private String currentSignIp;
 
 	@Column(name = "current_sign_in")
 	@Temporal(TemporalType.TIMESTAMP)
@@ -98,144 +89,6 @@ public class Users extends Audit implements Serializable {
 	@JoinTable(name = "user_board", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "boardId"))
 	Set<KanBan> kanBanSet;
 
-	public String getProviderToken() {
-		return providerToken;
-	}
-
-	public void setProviderToken(String providerToken) {
-		this.providerToken = providerToken;
-	}
-
-	public String getEmail() {
-		return emailId;
-	}
-
-	public void setEmail(String emailId) {
-		this.emailId = emailId;
-	}
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public long getProviderId() {
-		return providerId;
-	}
-
-	public void setProviderId(long providerId) {
-		this.providerId = providerId;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public int getSignInCount() {
-		return signInCount;
-	}
-
-	public void setSignInCount(int signInCount) {
-		this.signInCount = signInCount;
-	}
-
-	public String getSessionToken() {
-		return sessionToken;
-	}
-
-	public void setSessionToken(String sessionToken) {
-		this.sessionToken = sessionToken;
-	}
-
-	public String getResetPasswordToken() {
-		return resetPasswordToken;
-	}
-
-	public void setResetPasswordToken(String resetPasswordToken) {
-		this.resetPasswordToken = resetPasswordToken;
-	}
-
-	public String getPhotoUrl() {
-		return photoUrl;
-	}
-
-	public void setPhotoUrl(String photoUrl) {
-		this.photoUrl = photoUrl;
-	}
-
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-
-	public Date getLastSignIn() {
-		return lastSignIn;
-	}
-
-	public void setLastSignIn(Date lastSignIn) {
-		this.lastSignIn = lastSignIn;
-	}
-
-	public String getLastSignIp() {
-		return lastSignIp;
-	}
-
-	public void setLastSignIp(String lastSignIp) {
-		this.lastSignIp = lastSignIp;
-	}
-
-	public String getCurrentSignIp() {
-		return currentSignIp;
-	}
-
-	public void setCurrentSignIp(String currentSignIp) {
-		this.currentSignIp = currentSignIp;
-	}
-
-	public Date getCurrentSignIn() {
-		return currentSignIn;
-	}
-
-	public void setCurrentSignIn(Date currentSignIn) {
-		this.currentSignIn = currentSignIn;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public Set<Roles> getRole() {
-		return role;
-	}
-
-	public void setRole(Set<Roles> role) {
-		this.role = role;
-	}
-
-	public Set<Skills> getSkills() {
-		return skills;
-	}
-
-	public void setSkills(Set<Skills> skills) {
-		this.skills = skills;
-	}
-
+	@OneToMany(mappedBy = "users", cascade = CascadeType.ALL, orphanRemoval = true)
+	Set<ProjectUser> projectUsers;
 }