Fixed typos
Changed data model