Changed db file structure