Added the new DB structure