Made additional changes to db schema