Wired up model wrappers
toJSON now supports nested models