Commit Hadiya's changes + changed db schema