For #342 - some improvements, adding in nested models/collections piece