Index: src/main/java/edu/gjoko/schedlr/entity/Business.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Business.java	(revision 92808593942e93f1860eb3d10af72682c1f36d0f)
+++ src/main/java/edu/gjoko/schedlr/entity/Business.java	(revision 2b0a4db95e071b47a10460f6bb4d73d43885fb9c)
@@ -1,4 +1,5 @@
 package edu.gjoko.schedlr.entity;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -25,6 +26,6 @@
     private String name;
 
-    @Column(name = "business_type")
-    @Enumerated(EnumType.STRING)
+    @OneToOne
+    @JoinColumn(name = "business_type_id", referencedColumnName = "id")
     private BusinessType businessType;
 
@@ -39,4 +40,8 @@
     private Stakeholder owner;
 
+    @OneToMany(mappedBy = "business")
+    @JsonManagedReference
+    private List<Service> services;
+
     @Column(name = "created")
     private LocalDateTime created;
@@ -45,5 +50,4 @@
     private LocalDateTime modified;
 
-    @OneToMany(mappedBy = "business")
-    private List<Service> services;
+
 }
Index: src/main/java/edu/gjoko/schedlr/entity/BusinessType.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/BusinessType.java	(revision 92808593942e93f1860eb3d10af72682c1f36d0f)
+++ src/main/java/edu/gjoko/schedlr/entity/BusinessType.java	(revision 2b0a4db95e071b47a10460f6bb4d73d43885fb9c)
@@ -1,10 +1,49 @@
 package edu.gjoko.schedlr.entity;
 
-public enum BusinessType {
-    TAILOR,
-    NAIL_SALON,
-    MASSAGE_PARLOR,
-    MAKEUP_STUDIO,
-    HAIRDRESSER,
-    BARBER
+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;
 }
Index: src/main/java/edu/gjoko/schedlr/entity/Search.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Search.java	(revision 92808593942e93f1860eb3d10af72682c1f36d0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package edu.gjoko.schedlr.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class Search implements Serializable {
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date date;
-}
Index: src/main/java/edu/gjoko/schedlr/entity/Service.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision 92808593942e93f1860eb3d10af72682c1f36d0f)
+++ src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision 2b0a4db95e071b47a10460f6bb4d73d43885fb9c)
@@ -1,4 +1,5 @@
 package edu.gjoko.schedlr.entity;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -35,6 +36,11 @@
     private Float price;
 
+    @OneToOne
+    @JoinColumn(name = "service_type_id", referencedColumnName = "id")
+    private ServiceType serviceType;
+
     @ManyToOne
-    @JoinColumn(name = "business_id")
+    @JoinColumn(name="business_fk")
+    @JsonBackReference
     private Business business;
 
Index: src/main/java/edu/gjoko/schedlr/entity/ServiceType.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/ServiceType.java	(revision 2b0a4db95e071b47a10460f6bb4d73d43885fb9c)
+++ src/main/java/edu/gjoko/schedlr/entity/ServiceType.java	(revision 2b0a4db95e071b47a10460f6bb4d73d43885fb9c)
@@ -0,0 +1,47 @@
+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;
+}
