Massively improved nested model support

This extends to nested collection support as well