Riking's DBManager changes