Added the new database layout, with expiry field