diff --git a/MVMCore/MVMCore/Categories/Date+Extension.swift b/MVMCore/MVMCore/Categories/Date+Extension.swift
index 3f7df53..96a29ed 100644
--- a/MVMCore/MVMCore/Categories/Date+Extension.swift
+++ b/MVMCore/MVMCore/Categories/Date+Extension.swift
@@ -11,6 +11,10 @@ import Foundation
 public extension Date {
     
     static func unixMillisecondsNow() -> Int64 {
-        return Int64(Self().timeIntervalSince1970 * 1000)
+        return Self().unixMilliseconds()
+    }
+    
+    func unixMilliseconds() -> Int64 {
+        return Int64(self.timeIntervalSince1970 * 1000)
     }
 }
diff --git a/MVMCore/MVMCore/Models/Extensions/Encoder.swift b/MVMCore/MVMCore/Models/Extensions/Encoder.swift
index 832059b..a2ff048 100644
--- a/MVMCore/MVMCore/Models/Extensions/Encoder.swift
+++ b/MVMCore/MVMCore/Models/Extensions/Encoder.swift
@@ -43,9 +43,9 @@ extension Encodable {
         return jsonArray
     }
     
-    public func toJSONString() -> String? {
+    public func toJSONString(options: JSONSerialization.WritingOptions = .prettyPrinted) -> String? {
         guard let json = self.toJSON(),
-            let data = try? JSONSerialization.data(withJSONObject: json, options: .prettyPrinted),
+            let data = try? JSONSerialization.data(withJSONObject: json, options: options),
             let string = String(data: data, encoding: .utf8) else {
             return nil
         }