Index: src/main/java/edu/gjoko/schedlr/entity/Appointment.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Appointment.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ src/main/java/edu/gjoko/schedlr/entity/Appointment.java	(revision cf9cdbf9e2bef95a0adc1db2bc845ef45bf080d8)
@@ -1,8 +1,8 @@
 package edu.gjoko.schedlr.entity;
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import lombok.*;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import javax.persistence.*;
@@ -10,7 +10,7 @@
 
 @Entity
-@EntityListeners(AuditingEntityListener.class)
 @Table(name = "appointment")
-@Data
+@Getter
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
@@ -21,5 +21,5 @@
     private Long id;
 
-    @Column(name = "start_time")
+    @Column(name = "start_type")
     private LocalDateTime startTime;
 
@@ -27,29 +27,11 @@
     private LocalDateTime endTime;
 
-    @ManyToOne
-    @JoinColumn(name = "stakeholder_id")
-    @JsonBackReference(value = "customerAppointments")
-    private Stakeholder customer;
-
-    @ManyToOne
-    @JoinColumn(name = "service_id")
-    @JsonBackReference(value = "serviceAppointments")
-    private Service service;
-
-    @Column(name = "appointment_status", length = 32, columnDefinition = "varchar(32) default 'NEW'")
-    @Enumerated(EnumType.STRING)
-    private AppointmentStatus appointmentStatus = AppointmentStatus.NEW;
+    @Column(name = "price")
+    private Float price;
 
     @Column(name = "created")
-    @LastModifiedDate
     private LocalDateTime created;
 
     @Column(name = "modified")
-    @LastModifiedDate
     private LocalDateTime modified;
-
-    public String getTimePeriod() {
-        return startTime + " - " + endTime;
-    }
-
 }
Index: src/main/java/edu/gjoko/schedlr/entity/AppointmentStatus.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/AppointmentStatus.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package edu.gjoko.schedlr.entity;
-
-public enum AppointmentStatus {
-    NEW,
-    CANCELLED_BY_CUSTOMER,
-    CANCELLED_BY_BUSINESS_OWNER,
-    FINISHED_AND_REVIEWED_BY_USER;
-}
Index: src/main/java/edu/gjoko/schedlr/entity/Business.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Business.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ src/main/java/edu/gjoko/schedlr/entity/Business.java	(revision cf9cdbf9e2bef95a0adc1db2bc845ef45bf080d8)
@@ -1,21 +1,15 @@
 package edu.gjoko.schedlr.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Entity
-@EntityListeners(AuditingEntityListener.class)
 @Table(name = "business")
 @Getter
@@ -29,35 +23,28 @@
     private Long id;
 
-    @Column(name = "company_name")
-    private String companyName;
+    @Column(name = "name")
+    private String name;
 
-    @OneToOne
-    @JoinColumn(name = "business_type_id", referencedColumnName = "id")
-    @JsonProperty("businessType")
+    @Column(name = "business_type")
+    @Enumerated(EnumType.STRING)
     private BusinessType businessType;
 
-    @OneToOne(cascade = CascadeType.PERSIST)
-    @JoinColumn(name = "owner_id", referencedColumnName = "id", nullable = false)
-    @JsonProperty("owner")
+    @Column(name = "opening_time")
+    private LocalDateTime openingTime;
+
+    @Column(name = "closing_time")
+    private LocalDateTime closingTime;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "owner_id", referencedColumnName = "id")
     private Stakeholder owner;
 
-    @OneToMany(mappedBy = "business", cascade = CascadeType.PERSIST)
-    @JsonManagedReference(value = "services")
-    private List<Service> services;
-
-    @Column(name = "business_status")
-    @Enumerated(EnumType.STRING)
-    private BusinessStatus businessStatus;
-
     @Column(name = "created")
-    @CreatedDate
-    @JsonIgnore
     private LocalDateTime created;
 
     @Column(name = "modified")
-    @LastModifiedDate
-    @JsonIgnore
     private LocalDateTime modified;
 
-
+    @OneToMany(mappedBy = "business")
+    private List<Service> services;
 }
Index: src/main/java/edu/gjoko/schedlr/entity/BusinessStatus.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/BusinessStatus.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package edu.gjoko.schedlr.entity;
-
-public enum BusinessStatus {
-    NEW,
-    ACTIVE,
-    DEACTIVATED
-}
Index: src/main/java/edu/gjoko/schedlr/entity/BusinessType.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/BusinessType.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ src/main/java/edu/gjoko/schedlr/entity/BusinessType.java	(revision cf9cdbf9e2bef95a0adc1db2bc845ef45bf080d8)
@@ -1,49 +1,10 @@
 package edu.gjoko.schedlr.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import javax.persistence.*;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Entity
-@EntityListeners(AuditingEntityListener.class)
-@Table(name = "business_type")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class BusinessType {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE)
-    @JsonProperty("value")
-    private Long id;
-
-    @Column(name = "name")
-    @JsonProperty("text")
-    private String name;
-
-    @OneToMany(mappedBy="businessType")
-    @JsonManagedReference
-    private List<ServiceType> serviceTypes;
-
-    @Column(name = "created")
-    @CreatedDate
-    @JsonIgnore
-    private LocalDateTime created;
-
-    @Column(name = "modified")
-    @LastModifiedDate
-    @JsonIgnore
-    private LocalDateTime modified;
+public enum BusinessType {
+    TAILOR,
+    NAIL_SALON,
+    MASSAGE_PARLOR,
+    MAKEUP_STUDIO,
+    HAIRDRESSER,
+    BARBER
 }
Index: src/main/java/edu/gjoko/schedlr/entity/Review.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Review.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ 	(revision )
@@ -1,46 +1,0 @@
-package edu.gjoko.schedlr.entity;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import javax.persistence.*;
-import java.time.LocalDateTime;
-
-@Entity
-@EntityListeners(AuditingEntityListener.class)
-@Table(name = "review")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class Review {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE)
-    private Long id;
-
-    @Column(name = "rating")
-    private Integer rating;
-
-    @Column(name = "comment")
-    private String comment;
-
-    @OneToOne
-    @JoinColumn(name = "appointment_id", referencedColumnName = "id")
-    @JsonProperty("appointment")
-    private Appointment appointment;
-
-    @Column(name = "created")
-    @LastModifiedDate
-    private LocalDateTime created;
-
-    @Column(name = "modified")
-    @LastModifiedDate
-    private LocalDateTime modified;
-}
Index: src/main/java/edu/gjoko/schedlr/entity/Service.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision cf9cdbf9e2bef95a0adc1db2bc845ef45bf080d8)
@@ -1,21 +1,12 @@
 package edu.gjoko.schedlr.entity;
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @Entity
-@EntityListeners(AuditingEntityListener.class)
 @Table(name = "service")
 @Getter
@@ -29,44 +20,15 @@
     private Long id;
 
+    @Column(name = "name")
+    private String name;
+
     @Column(name = "duration")
     private Integer duration;
 
     @Column(name = "price")
-    private Integer price;
-
-    @Column(name = "cumulated_rating")
-    private Float rating = 0.0f;
-
-    @Column(name = "reviews_count")
-    private Integer reviewsCount = 0;
-
-    @OneToOne(cascade = CascadeType.MERGE)
-    @JoinColumn(name = "service_type_id", referencedColumnName = "id")
-    private ServiceType serviceType;
+    private Float price;
 
     @ManyToOne
     @JoinColumn(name = "business_id")
-    @JsonBackReference(value = "services")
     private Business business;
-
-    @Column(name = "description")
-    private String description;
-
-    @OneToMany(mappedBy="service")
-    @JsonManagedReference(value = "serviceAppointments")
-    private List<Appointment> appointments;
-
-    @Column(name = "service_status")
-    @Enumerated(EnumType.STRING)
-    private ServiceStatus serviceStatus = ServiceStatus.ACTIVE;
-
-    @Column(name = "created")
-    @CreatedDate
-    @JsonIgnore
-    private LocalDateTime created;
-
-    @Column(name = "modified")
-    @LastModifiedDate
-    @JsonIgnore
-    private LocalDateTime modified;
 }
Index: src/main/java/edu/gjoko/schedlr/entity/ServiceStatus.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/ServiceStatus.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package edu.gjoko.schedlr.entity;
-
-public enum ServiceStatus {
-
-    ACTIVE,
-
-    INACTIVE
-}
Index: src/main/java/edu/gjoko/schedlr/entity/ServiceType.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/ServiceType.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ 	(revision )
@@ -1,46 +1,0 @@
-package edu.gjoko.schedlr.entity;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import javax.persistence.*;
-import java.time.LocalDateTime;
-
-@Entity
-@EntityListeners(AuditingEntityListener.class)
-@Table(name = "service_type")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class ServiceType {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE)
-    private Long id;
-
-    @Column(name = "name")
-    private String name;
-
-    @ManyToOne
-    @JoinColumn(name = "business_type_id")
-    @JsonBackReference
-    private BusinessType businessType;
-
-    @Column(name = "created")
-    @CreatedDate
-    @JsonIgnore
-    private LocalDateTime created;
-
-    @Column(name = "modified")
-    @LastModifiedDate
-    @JsonIgnore
-    private LocalDateTime modified;
-}
Index: src/main/java/edu/gjoko/schedlr/entity/Stakeholder.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Stakeholder.java	(revision 943857ccadc5bd0933c2bd0b003629ae75c29b17)
+++ src/main/java/edu/gjoko/schedlr/entity/Stakeholder.java	(revision cf9cdbf9e2bef95a0adc1db2bc845ef45bf080d8)
@@ -1,20 +1,13 @@
 package edu.gjoko.schedlr.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
-import java.util.List;
 
 @Entity
-@EntityListeners(AuditingEntityListener.class)
 @Table(name = "stakeholder")
 @Getter
@@ -41,7 +34,4 @@
     private String email;
 
-    @Column(name = "phone_number")
-    private String phoneNumber;
-
     @Column(name = "username")
     private String username;
@@ -50,20 +40,8 @@
     private String password;
 
-    @OneToMany(mappedBy = "customer")
-    @JsonManagedReference(value = "customerAppointments")
-    private List<Appointment> appointments;
-
     @Column(name = "created")
-    @CreatedDate
-    @JsonIgnore
     private LocalDateTime created;
 
     @Column(name = "modified")
-    @LastModifiedDate
-    @JsonIgnore
     private LocalDateTime modified;
-
-    public String getFullName() {
-        return firstName + " " + lastName;
-    }
 }
