Fixed models & updated DatabaseHandler.