diff --git a/couchpotato/core/plugins/dashboard/main.py b/couchpotato/core/plugins/dashboard/main.py
index 2da4d8c..06d32bd 100644
--- a/couchpotato/core/plugins/dashboard/main.py
+++ b/couchpotato/core/plugins/dashboard/main.py
@@ -4,7 +4,7 @@ from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.variable import splitString, tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Movie, Library, LibraryTitle
+from couchpotato.core.settings.model import Media, Library, LibraryTitle
 from sqlalchemy.orm import joinedload_all
 from sqlalchemy.sql.expression import asc
 import random as rndm
@@ -49,11 +49,11 @@ class Dashboard(Plugin):
 
         # Get all active movies
         active_status = fireEvent('status.get', ['active'], single = True)
-        q = db.query(Movie) \
+        q = db.query(Media) \
             .join(Library) \
-            .filter(Movie.status_id == active_status.get('id')) \
-            .with_entities(Movie.id, Movie.profile_id, Library.info, Library.year) \
-            .group_by(Movie.id)
+            .filter(Media.status_id == active_status.get('id')) \
+            .with_entities(Media.id, Media.profile_id, Library.info, Library.year) \
+            .group_by(Media.id)
 
         if not random:
             q = q.join(LibraryTitle) \
diff --git a/couchpotato/core/plugins/suggestion/main.py b/couchpotato/core/plugins/suggestion/main.py
index 2cedeba..d2b33c4 100644
--- a/couchpotato/core/plugins/suggestion/main.py
+++ b/couchpotato/core/plugins/suggestion/main.py
@@ -3,7 +3,7 @@ from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Movie, Library
+from couchpotato.core.settings.model import Media, Library
 from couchpotato.environment import Env
 from sqlalchemy.orm import joinedload_all
 from sqlalchemy.sql.expression import or_
@@ -29,9 +29,9 @@ class Suggestion(Plugin):
 
             if not movies or len(movies) == 0:
                 db = get_session()
-                active_movies = db.query(Movie) \
+                active_movies = db.query(Media) \
                     .options(joinedload_all('library')) \
-                    .filter(or_(*[Movie.status.has(identifier = s) for s in ['active', 'done']])).all()
+                    .filter(or_(*[Media.status.has(identifier = s) for s in ['active', 'done']])).all()
                 movies = [x.library.identifier for x in active_movies]
 
             if not ignored or len(ignored) == 0:
@@ -89,10 +89,10 @@ class Suggestion(Plugin):
             active_status, done_status = fireEvent('status.get', ['active', 'done'], single = True)
 
             db = get_session()
-            active_movies = db.query(Movie) \
+            active_movies = db.query(Media) \
                 .join(Library) \
                 .with_entities(Library.identifier) \
-                .filter(Movie.status_id.in_([active_status.get('id'), done_status.get('id')])).all()
+                .filter(Media.status_id.in_([active_status.get('id'), done_status.get('id')])).all()
             movies = [x[0] for x in active_movies]
             movies.extend(seen)
 
diff --git a/couchpotato/core/settings/model.py b/couchpotato/core/settings/model.py
index 1c2c049..3240282 100644
--- a/couchpotato/core/settings/model.py
+++ b/couchpotato/core/settings/model.py
@@ -1,3 +1,5 @@
+from UserDict import DictMixin
+from collections import OrderedDict
 from couchpotato.core.helpers.encoding import toUnicode
 from elixir.entity import Entity
 from elixir.fields import Field
@@ -5,9 +7,7 @@ from elixir.options import options_defaults, using_options
 from elixir.relationships import ManyToMany, OneToMany, ManyToOne
 from sqlalchemy.ext.mutable import Mutable
 from sqlalchemy.types import Integer, Unicode, UnicodeText, Boolean, String, \
-    TypeDecorator, Float, BLOB
-from UserDict import DictMixin
-from collections import OrderedDict
+    TypeDecorator
 import json
 import time