Made some changes to datamodel