Added some fields to data model