Revamped the data model and made it more convetional