Fixed Database.class