Db Class fixed