Db classes changes