Some changes on the DB-Provider