supplement of last commit - changes to DB structure