Update toJSON to recurse into collection items and model values