diff --git a/configuration/kubernetes/deployment.yaml b/configuration/kubernetes/deployment.yaml
index fa95735..8767d63 100644
--- a/configuration/kubernetes/deployment.yaml
+++ b/configuration/kubernetes/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   name: RESOURCE_NAME
   namespace: default
 spec:
-  replicas: 2
+  replicas: 0
   selector:
     matchLabels:
       app: RESOURCE_NAME
diff --git a/src/main/java/cryptosky/me/graphql/pricing/models/entities/CryptoPriceModel.java b/src/main/java/cryptosky/me/graphql/pricing/models/entities/CryptoPriceModel.java
index 610c392..55e4433 100644
--- a/src/main/java/cryptosky/me/graphql/pricing/models/entities/CryptoPriceModel.java
+++ b/src/main/java/cryptosky/me/graphql/pricing/models/entities/CryptoPriceModel.java
@@ -3,7 +3,7 @@ package cryptosky.me.graphql.pricing.models.entities;
 import lombok.*;
 
 import javax.persistence.*;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @AllArgsConstructor
 @NoArgsConstructor
@@ -17,7 +17,7 @@ public class CryptoPriceModel {
     private int id;
 
     @Column(name = "timestamp", nullable = false)
-    private Date timestamp;
+    private LocalDateTime timestamp;
 
     @Column(name = "symbol", nullable = false)
     private String type;
diff --git a/src/main/java/cryptosky/me/graphql/pricing/mutations/BtcPriceMutation.java b/src/main/java/cryptosky/me/graphql/pricing/mutations/BtcPriceMutation.java
index 552377d..9333e2d 100644
--- a/src/main/java/cryptosky/me/graphql/pricing/mutations/BtcPriceMutation.java
+++ b/src/main/java/cryptosky/me/graphql/pricing/mutations/BtcPriceMutation.java
@@ -7,15 +7,13 @@ import org.springframework.stereotype.Component;
 
 import cryptosky.me.graphql.pricing.service.BtcPriceService;
 
-import java.util.Date;
-
 @Component
 public class BtcPriceMutation implements GraphQLMutationResolver {
 
     @Autowired
     private BtcPriceService btcPriceService;
 
-    public BtcPriceModel createBtc(final Date createdDate, final String type, final float av_price,
+    public BtcPriceModel createBtc(final String createdDate, final String type, final float av_price,
                                    final float h_price, final float l_price, final float o_price,
                                    final float c_price, final float volume ) {
         return this.btcPriceService.createBtc(createdDate, type, av_price, h_price, l_price, o_price, c_price, volume);
diff --git a/src/main/java/cryptosky/me/graphql/pricing/queries/BtcPriceQuery.java b/src/main/java/cryptosky/me/graphql/pricing/queries/BtcPriceQuery.java
index 0bf829d..8b55d18 100644
--- a/src/main/java/cryptosky/me/graphql/pricing/queries/BtcPriceQuery.java
+++ b/src/main/java/cryptosky/me/graphql/pricing/queries/BtcPriceQuery.java
@@ -27,11 +27,11 @@ public class BtcPriceQuery implements GraphQLQueryResolver {
         return this.btcPriceService.getLatest();
     }
 
-//    public Optional<BtcPriceModel> getPriceForCreatedDate( final String createdDate ) {
-//        return this.btcPriceService.getPriceForCreatedDate(createdDate);
-//    }
-//
-//    public List<BtcPriceModel> getPriceBetweenDates(final String startDate, final String endDate ) {
-//        return this.btcPriceService.getPriceBetweenDates(startDate, endDate);
-//    }
+    public Optional<BtcPriceModel> getPriceForCreatedDate( final String createdDate ) {
+        return this.btcPriceService.getPriceForCreatedDate(createdDate);
+    }
+
+    public List<BtcPriceModel> getPriceBetweenDates(final String startDate, final String endDate ) {
+        return this.btcPriceService.getPriceBetweenDates(startDate, endDate);
+    }
 }
diff --git a/src/main/java/cryptosky/me/graphql/pricing/service/BtcPriceService.java b/src/main/java/cryptosky/me/graphql/pricing/service/BtcPriceService.java
index 911281e..968986f 100644
--- a/src/main/java/cryptosky/me/graphql/pricing/service/BtcPriceService.java
+++ b/src/main/java/cryptosky/me/graphql/pricing/service/BtcPriceService.java
@@ -5,11 +5,12 @@ import cryptosky.me.graphql.pricing.models.repositories.BtcPriceRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import java.time.LocalDateTime;
+
 import static cryptosky.me.helpers.Utils.format;
 
 @Service
@@ -22,12 +23,12 @@ public class BtcPriceService {
     }
 
     @Transactional
-    public BtcPriceModel createBtc(final Date createdDate, final String type, final float av_price,
+    public BtcPriceModel createBtc(final String createdDate, final String type, final float av_price,
                                    final float h_price, final float l_price, final float o_price,
                                    final float c_price, final float volume ) {
 
         final BtcPriceModel btcPrice = new BtcPriceModel();
-        btcPrice.setTimestamp(createdDate);
+        btcPrice.setTimestamp(LocalDateTime.parse((createdDate)));
         btcPrice.setType(type);
         btcPrice.setAverage_price(av_price);
         btcPrice.setHigh_price(h_price);
@@ -59,20 +60,20 @@ public class BtcPriceService {
         return this.btcPriceRepository.findAll().stream().findFirst();
     }
 
-//    @Transactional(readOnly = true)
-//    public Optional<BtcPriceModel> getPriceForCreatedDate( final String createdDate ) {
-//        return this.btcPriceRepository.findAll().stream()
-//                .filter(createdDateList -> createdDateList.getTimestamp().equals(format(createdDate)))
-//                .findFirst();
-//    }
+    @Transactional(readOnly = true)
+    public Optional<BtcPriceModel> getPriceForCreatedDate( final String createdDate ) {
+        return this.btcPriceRepository.findAll().stream()
+                .filter(createdDateList -> createdDateList.getTimestamp().equals(format(createdDate)))
+                .findFirst();
+    }
 
-//    @Transactional(readOnly = true)
-//    public List<BtcPriceModel> getPriceBetweenDates( final String startDate, final String endDate ) {
-//        return this.btcPriceRepository.findAll().stream()
-//                .filter(createdDateList -> format(createdDateList.getTimestamp()).isBefore(format(endDate)))
-//                .filter(createdDateList -> format(createdDateList.getTimestamp()).isAfter(format(startDate)))
-//                .collect(Collectors.toList());
-//    }
+    @Transactional(readOnly = true)
+    public List<BtcPriceModel> getPriceBetweenDates( final String startDate, final String endDate ) {
+        return this.btcPriceRepository.findAll().stream()
+                .filter(createdDateList -> format(createdDateList.getTimestamp().toString()).isBefore(format(endDate)))
+                .filter(createdDateList -> format(createdDateList.getTimestamp().toString()).isAfter(format(startDate)))
+                .collect(Collectors.toList());
+    }
 
 //    @Transactional(readOnly = true)
 //    public List<BtcPriceModel> getAllLatest() {