New database class, removed old classes.