Fixed issue with nested models and collections