Template fields now handle nil values correctly
Template fields now support all collection types, including unordered