diff --git a/src/aggregator/stats_from_files.py b/src/aggregator/stats_from_files.py
new file mode 100644
index 0000000..40aa64f
--- /dev/null
+++ b/src/aggregator/stats_from_files.py
@@ -0,0 +1,86 @@
+import json
+import time
+import requests
+import datetime
+
+from os import listdir
+from os.path import isfile, join
+from collections import OrderedDict
+from auth_credentials import (
+    client_headers, get_artist_stats_extensions
+)
+
+
+def main():
+    print(f'                                         [T] Time: {datetime.datetime.now()}')
+
+    timeout, request_count = 1, 0
+
+    artists_path = "resources/artists"
+    artist_ids = [file.split('.')[0].split('-')[1] for file in listdir(artists_path) if isfile(join(artists_path, file))]
+
+    artist_count = 1645
+    for artist_id in artist_ids[1645:]:
+        get_artist_stats_params = {
+            'operationName': 'queryArtistOverview',
+            'variables': '{"uri":"spotify:artist:' +
+                         artist_id + '","locale":"","includePrerelease":true,"enableAssociatedVideos":false}',
+            'extensions': get_artist_stats_extensions,
+        }
+
+        response = requests.get(
+            'https://api-partner.spotify.com/pathfinder/v1/query',
+            params=get_artist_stats_params,
+            headers=client_headers
+        )
+        time.sleep(timeout)
+        request_count += 1
+        print(f"Artist Stats {artist_id}  - [*] [Request {request_count} - {response.status_code}] - Number {artist_count}")
+
+        artist_stats = response.json().get('data').get('artistUnion').get('stats')
+
+        with open(f'resources/artists/artist-{artist_id}.json', 'r+', encoding='utf-8') as artist_file:
+            data = json.load(artist_file, object_pairs_hook=OrderedDict)
+            data['followers'] = artist_stats.get('followers')
+            data['monthly_listeners'] = artist_stats.get('monthlyListeners')
+            data['world_rank'] = artist_stats.get('worldRank')
+            data['top_cities'] = artist_stats.get('topCities').get('items')
+            artist_file.seek(0)
+            json.dump(data, artist_file, indent=4, sort_keys=False, ensure_ascii=False)
+            artist_file.truncate()
+
+        with open(f'resources/artists/artist-{artist_id}.json', 'r', encoding='utf-8') as artist_file:
+            data = json.load(artist_file)
+
+        artist_albums = data.get('albums')
+        albums_ids = list()
+        for album in artist_albums:
+            albums_ids.append(album.get('album_id'))
+
+        for album_id in albums_ids:
+            # print(f"Get Album {album_id}")
+
+            with open(f'resources/albums/{album_id}.json', 'r', encoding='utf-8') as album_file:
+                album_data = json.load(album_file)
+
+                tracks_data = album_data.get('data').get('albumUnion').get('tracks').get('items')
+
+                for track in tracks_data:
+                    track_data = track.get('track')
+                    track_id = track_data.get('uri').split(':')[2]
+                    track_playcount = track_data.get('playcount')
+
+                    with open(f'resources/artists/artist-{artist_id}.json', 'r+', encoding='utf-8') as artist_file:
+                        data = json.load(artist_file, object_pairs_hook=OrderedDict)
+                        for artist_track in data.get('tracks'):
+                            if artist_track.get('track_id') == track_id:
+                                artist_track['playcount'] = track_playcount
+                        artist_file.seek(0)
+                        json.dump(data, artist_file, indent=4, sort_keys=False, ensure_ascii=False)
+                        artist_file.truncate()
+        artist_count += 1
+
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/aggregator/tracks_count.py b/src/aggregator/tracks_count.py
index 139067f..fb6b800 100644
--- a/src/aggregator/tracks_count.py
+++ b/src/aggregator/tracks_count.py
@@ -6,7 +6,8 @@
 
 artists_files = [file for file in listdir(artists_path) if isfile(join(artists_path, file))]
 
-artist_count, albums_count, tracks_count = 0, 0, 0
+artist_count = 0
+albums_list, tracks_list = list(), list()
 for artist_file in artists_files:
     with open(f'resources/artists/{artist_file}', 'r', encoding='utf-8') as artist:
         artist_data = json.load(artist)
@@ -15,11 +16,13 @@
 
         artist_albums = artist_data.get('albums')
         for album in artist_albums:
-            albums_count += 1
+            album_id = album.get('album_id')
+            albums_list.append(album_id)
 
         artist_tracks = artist_data.get('tracks')
         for track in artist_tracks:
-            tracks_count += 1
+            track_id = track.get('track_id')
+            tracks_list.append(track_id)
 
-# Artists: 2005, Albums: 50292, Tracks: 269736
-print(f'Artists: {artist_count}, Albums: {albums_count}, Tracks: {tracks_count}')
+# Artists: 2004, Albums: 49820, Tracks: 268643
+print(f'Artists: {artist_count}, Albums: {len(set(albums_list))}, Tracks: {len(set(tracks_list))}')