Made some changes to the databse structure