fix some of the bugs with complex types(cross references), left
collections and inheritance
streams is not working - tbd