diff --git a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java
index 43da51e3a75c1ded59ec1c4f920beab256cc70b5..9a4c89d19e4d91ccfcce4e25767e79f42647ea21 100644
--- a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java
+++ b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java
@@ -7,6 +7,8 @@ import java.io.Serializable;
 
 @Data
 @Entity
+@AllArgsConstructor
+@NoArgsConstructor
 public class Account implements Serializable {
 
     private static final long serialVersionUID = 2L;
diff --git a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java
index d824b8b862cbc62c57c60b6814503b313bb98585..248036d4876b0f079fb0d785a532692d19081eff 100644
--- a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java
+++ b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java
@@ -7,6 +7,8 @@ import java.io.Serializable;
 
 @Data
 @Entity
+@AllArgsConstructor
+@NoArgsConstructor
 public class Client implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Account.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Account.class
index 8960d3d1cc7921bbcf85f609a983a16edcac288d..2b55e51f6b6cb27eb64b7d1984b2351495b28ed0 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Account.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Account.class differ
diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class
index 5d2d7eb7061d501240ec8b81d74abaa20f8b68dc..90a6707e3f499160872ab44c63148ed1b5bbb569 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class differ
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Account.java b/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Account.java
index 9eaee50273480deb933b407c43521d966108bc02..4b919281c0d8acb49e9b0180dd7291c543aa25ec 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Account.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Account.java
@@ -1,41 +1,26 @@
 package br.ufrn.imd.client.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
 import java.io.Serializable;
 
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
 public class Account implements Serializable {
-    private static final long serialVersionUID = 2L;
-    private Integer id;
-    private String number;
-    private Double balance;
-
-    public Account() {}
-    public Account(Integer id, String number, Double balance) {
-        this.id = id;
-        this.number = number;
-        this.balance = balance;
-    }
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getNumber() {
-        return number;
-    }
+    private static final long serialVersionUID = 2L;
 
-    public void setNumber(String number) {
-        this.number = number;
-    }
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
 
-    public Double getBalance() {
-        return balance;
-    }
+    @Column(unique = true)
+    private String number;
 
-    public void setBalance(Double balance) {
-        this.balance = balance;
-    }
+    private Double balance;
 }
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Client.java b/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Client.java
index 3aa1f75c4c7dc5b841d2eadc4bbf0a5bfa77bad2..955b1fa22823da763558f2882501c1c2933b5dac 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Client.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/domain/Client.java
@@ -2,14 +2,30 @@ package br.ufrn.imd.client.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
 @Data
+@Entity
 @AllArgsConstructor
+@NoArgsConstructor
 public class Client implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
+    private String name;
+
+    @OneToOne
+    @JoinColumn(name = "account_id")
+    private Account account;
+
+    public Client(Integer id) {
+        this.id = id;
+    }
 }
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
index 26ee287bc239cee1c23201b19dffb8a0a4790b04..4d7f440a7555724ef2dfbf0a92c976ac9a077ee4 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
@@ -124,11 +124,11 @@ public class MachineState {
             }
 
         } else if(state.equals(BALANCE)) {
-            ResponseEntity<Account> response =
-                    restTemplate.getForEntity(HOST_BALANCE_SERVICE + "/1", Account.class);
+            ResponseEntity<Client> response =
+                    restTemplate.getForEntity(HOST_BALANCE_SERVICE + "/1", Client.class);
             if(response.getStatusCodeValue() == 200) {
                 System.out.println(
-                        String.format(">>> Your balance is: %.2f", response.getBody().getBalance())
+                        String.format(">>> Your balance is: %.2f", response.getBody().getAccount().getBalance())
                 );
             }
             try {
diff --git a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Account.java b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Account.java
index becc0a60497626056feba58a6406bed644d83a25..78adadad85d2476ec4dd9186a48083834caa9d70 100644
--- a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Account.java
+++ b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Account.java
@@ -7,8 +7,7 @@ import java.io.Serializable;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Setter
-@Getter
+@Data
 @Entity
 public class Account implements Serializable {
 
diff --git a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Client.java b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Client.java
index 52f7c6369dd784427b982b8bd92837c709336ea6..47881bb5c08164eb4a4c2eb4784652f6dde90abf 100644
--- a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Client.java
+++ b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/domain/Client.java
@@ -7,8 +7,7 @@ import java.io.Serializable;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Setter
-@Getter
+@Data
 @Entity
 public class Client implements Serializable {
 
diff --git a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Account.java b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Account.java
index aa147cb817f9cd5de9d8f57917ceb2956ea05563..c2b757baf9005f40b69774040033180cba2c23a1 100644
--- a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Account.java
+++ b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Account.java
@@ -7,8 +7,7 @@ import java.io.Serializable;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Setter
-@Getter
+@Data
 @Entity
 public class Account implements Serializable {
 
diff --git a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Client.java b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Client.java
index 79a7f251ad79fe5c74f3de5c6a657a7dada9584f..a4ede228c625037b24ae7a21e9199752783146f3 100644
--- a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Client.java
+++ b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/domain/Client.java
@@ -7,8 +7,7 @@ import java.io.Serializable;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Setter
-@Getter
+@Data
 @Entity
 public class Client implements Serializable {
 
diff --git a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Account.java b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Account.java
index e96c20756ddcc3639386f25b9525209deb1a97ce..1431f514e9214024bf976c2c626888c946299b40 100644
--- a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Account.java
+++ b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Account.java
@@ -7,8 +7,7 @@ import java.io.Serializable;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Setter
-@Getter
+@Data
 @Entity
 public class Account implements Serializable {
 
diff --git a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Client.java b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Client.java
index af2368f3a4d749cc8efab46ce91595865ebc180a..b1de654f1ce2d58cd723816305f725f69a7487d4 100644
--- a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Client.java
+++ b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/domain/Client.java
@@ -7,8 +7,7 @@ import java.io.Serializable;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Setter
-@Getter
+@Data
 @Entity
 public class Client implements Serializable {
 
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class
index efc81792b6d3adf086960859ca0c809421a9d70b..cd1485167173b8cf19436b0f2f4d8ba628df9355 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class differ
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class
index 2625605e6d1bba272ba887022881afbb37aeabce..2a57f8225f579e5c8fc4daacd06e0c932404d77b 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class differ