Some changes concerning the DB behavior