Bug fix - return object type (#236)
Add new fields to  view model 9#236)