diff --git a/video_metadata/views/file_listing.py b/video_metadata/views/file_listing.py
index d12f392..0729e58 100644
--- a/video_metadata/views/file_listing.py
+++ b/video_metadata/views/file_listing.py
@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 import os
 import re
 
@@ -12,14 +13,14 @@ MAX_RECURSE_DEPTH = 5
 bp = Blueprint('file_listing', __name__, url_prefix='/file_listing')
 
 
-class path_entry(object):
-    def __init__(self):
-        self.base_name = ''
-        self.rel_path = '' # NOTE: fs path relative to config['MOVIE_DIR']
-        self.file_extension = ''
-        self.is_dir = False
-        self.depth = 0
-        self.contents = []
+@dataclass
+class path_entry:
+    base_name = ''
+    rel_path = '' # NOTE: fs path relative to config['MOVIE_DIR']
+    file_extension = ''
+    is_dir = False
+    depth = 0
+    contents = []
 
 
 @bp.route('/')
diff --git a/video_metadata/views/tmdb.py b/video_metadata/views/tmdb.py
index 5ef58dc..9a1c994 100644
--- a/video_metadata/views/tmdb.py
+++ b/video_metadata/views/tmdb.py
@@ -1,5 +1,6 @@
 
 import cgi
+from dataclasses import dataclass
 from datetime import date
 from enum import Enum
 import json
@@ -41,37 +42,37 @@ class query_type(Enum):
     MOVIE   = 1
     TV_SHOW = 2
 
-class query_data(object):
-    def __init__(self):
-        self.errors = []
-        self.full_url = ''
-        self.movie_year = 0
-        self.parsed_query_str = ''
-        self.query_params = {}
-        self.query_type = query_type.UNKNOWN
-        self.raw_query_str = ''
-        self.rel_path = ''
-        self.tmdb_api_key = ''
-
+@dataclass
+class query_data:
+    errors = []
+    full_url = ''
+    movie_year = 0
+    parsed_query_str = ''
+    query_params = {}
+    query_type = query_type.UNKNOWN
+    raw_query_str = ''
+    rel_path = ''
+    tmdb_api_key = ''
+
+@dataclass
 class response_data(object):
-    def __init__(self):
-        self.errors = []
-        self.parsed_response = {}
-        self.response_body = ''
-        self.response_headers = []
-        self.response_status = 0
-        self.result_count = 0
+    errors = []
+    parsed_response = {}
+    response_body = ''
+    response_headers = []
+    response_status = 0
+    result_count = 0
 
+@dataclass
 class view_result(object):
-    def __init__(self):
-        self.id = 0
-        self.title = ''
-        self.release_date = 0
-        self.overview = ''
-        self.genre_ids = []
-        self.original_language = ''
-        self.poster_path = 'no_image.png'
-        self.tmdb_link = ''
+    id = 0
+    title = ''
+    release_date = 0
+    overview = ''
+    genre_ids = []
+    original_language = ''
+    poster_path = 'no_image.png'
+    tmdb_link = ''
 
 
 ####################