diff --git a/src/data/firestoreClient/index.ts b/src/data/firestoreClient/index.ts
index 1f682b6..5d9cf61 100644
--- a/src/data/firestoreClient/index.ts
+++ b/src/data/firestoreClient/index.ts
@@ -1,5 +1,8 @@
-import firebase from 'firebase'
+import firebase from 'firebase/app'
 import 'firebase/firestore'
+import 'firebase/storage'
+import 'firebase/auth'
+import 'firebase/functions'
 import config from 'src/config'
 try {
   let firebaseConfig = {
@@ -30,7 +33,8 @@ export {
 }
 // - Database authorize
 export let firebaseAuth = firebase.auth
-export let firebaseRef = firebase.database().ref()
+export let functions = firebase.functions()
+// export let firebaseRef = firebase.database().ref()
 
 // - Firebase default
 export default firebase
diff --git a/src/data/firestoreClient/services/authorize/AuthorizeService.ts b/src/data/firestoreClient/services/authorize/AuthorizeService.ts
index da11965..14c03ae 100644
--- a/src/data/firestoreClient/services/authorize/AuthorizeService.ts
+++ b/src/data/firestoreClient/services/authorize/AuthorizeService.ts
@@ -1,7 +1,7 @@
 import { Profile } from 'core/domain/users'
 
 // - Import react components
-import { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import { firebaseAuth, db } from 'data/firestoreClient'
 
 import { IAuthorizeService } from 'core/services/authorize'
 import { User, UserProvider } from 'core/domain/users'
diff --git a/src/data/firestoreClient/services/circles/CircleService.ts b/src/data/firestoreClient/services/circles/CircleService.ts
index 6ba3229..7e2e2c1 100644
--- a/src/data/firestoreClient/services/circles/CircleService.ts
+++ b/src/data/firestoreClient/services/circles/CircleService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import { firebaseAuth, db } from 'data/firestoreClient'
 
 import { SocialError } from 'core/domain/common'
 import { ICircleService } from 'core/services/circles'
diff --git a/src/data/firestoreClient/services/circles/UserTieService.ts b/src/data/firestoreClient/services/circles/UserTieService.ts
index 8c0f859..7c4bd90 100644
--- a/src/data/firestoreClient/services/circles/UserTieService.ts
+++ b/src/data/firestoreClient/services/circles/UserTieService.ts
@@ -1,6 +1,6 @@
 // - Import react components
 import { datumString } from 'aws-sdk/clients/athena'
-import firebase, { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import firebase, {  firebaseAuth, db } from 'data/firestoreClient'
 import moment from 'moment/moment'
 
 import { SocialError } from 'core/domain/common'
diff --git a/src/data/firestoreClient/services/comments/CommentService.ts b/src/data/firestoreClient/services/comments/CommentService.ts
index 8d1ad58..699ab82 100644
--- a/src/data/firestoreClient/services/comments/CommentService.ts
+++ b/src/data/firestoreClient/services/comments/CommentService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import { firebaseAuth, db } from 'data/firestoreClient'
 import _ from 'lodash'
 
 import { SocialError } from 'core/domain/common'
diff --git a/src/data/firestoreClient/services/common/CommonService.ts b/src/data/firestoreClient/services/common/CommonService.ts
index 4fdea8d..c9861b4 100644
--- a/src/data/firestoreClient/services/common/CommonService.ts
+++ b/src/data/firestoreClient/services/common/CommonService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import { firebaseAuth, db } from 'data/firestoreClient'
 
 import { SocialError, Feed } from 'core/domain/common'
 import { ICommonService } from 'core/services/common'
diff --git a/src/data/firestoreClient/services/graphs/GraphService.ts b/src/data/firestoreClient/services/graphs/GraphService.ts
index e21a934..78493fd 100644
--- a/src/data/firestoreClient/services/graphs/GraphService.ts
+++ b/src/data/firestoreClient/services/graphs/GraphService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import firebase, { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import firebase, {  firebaseAuth, db } from 'data/firestoreClient'
 import { SocialError } from 'core/domain/common'
 import { Graph } from 'core/domain/graphs'
 import { IGraphService } from './IGraphService'
diff --git a/src/data/firestoreClient/services/imageGallery/ImageGalleryService.ts b/src/data/firestoreClient/services/imageGallery/ImageGalleryService.ts
index 0b3a5cf..3634f42 100644
--- a/src/data/firestoreClient/services/imageGallery/ImageGalleryService.ts
+++ b/src/data/firestoreClient/services/imageGallery/ImageGalleryService.ts
@@ -1,6 +1,6 @@
 import { FileResult } from 'models/files/fileResult'
 // - Import react components
-import { firebaseRef, firebaseAuth, storageRef, db } from 'data/firestoreClient'
+import { firebaseAuth, storageRef, db } from 'data/firestoreClient'
 
 import { SocialError } from 'core/domain/common'
 import { IImageGalleryService } from 'core/services/imageGallery'
diff --git a/src/data/firestoreClient/services/notifications/notificationService.ts b/src/data/firestoreClient/services/notifications/notificationService.ts
index ef13bbc..eb4e3b3 100644
--- a/src/data/firestoreClient/services/notifications/notificationService.ts
+++ b/src/data/firestoreClient/services/notifications/notificationService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import { firebaseAuth, db } from 'data/firestoreClient'
 
 import { SocialError } from 'core/domain/common'
 import { Notification } from 'core/domain/notifications'
diff --git a/src/data/firestoreClient/services/posts/PostService.ts b/src/data/firestoreClient/services/posts/PostService.ts
index 871137c..785776f 100644
--- a/src/data/firestoreClient/services/posts/PostService.ts
+++ b/src/data/firestoreClient/services/posts/PostService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import { firebaseAuth, db } from 'data/firestoreClient'
 
 import { SocialError } from 'core/domain/common'
 import { Post } from 'core/domain/posts'
diff --git a/src/data/firestoreClient/services/users/UserService.ts b/src/data/firestoreClient/services/users/UserService.ts
index d9f2699..de812aa 100644
--- a/src/data/firestoreClient/services/users/UserService.ts
+++ b/src/data/firestoreClient/services/users/UserService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import firebase, { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import firebase, {  firebaseAuth, db } from 'data/firestoreClient'
 import moment from 'moment/moment'
 
 import { SocialError } from 'core/domain/common'
diff --git a/src/data/firestoreClient/services/votes/VoteService.ts b/src/data/firestoreClient/services/votes/VoteService.ts
index 3ac7285..5398270 100644
--- a/src/data/firestoreClient/services/votes/VoteService.ts
+++ b/src/data/firestoreClient/services/votes/VoteService.ts
@@ -1,5 +1,5 @@
 // - Import react components
-import { firebaseRef, firebaseAuth, db } from 'data/firestoreClient'
+import { firebaseAuth, db } from 'data/firestoreClient'
 
 import { SocialError } from 'core/domain/common'
 import { Vote } from 'core/domain/votes'