Added generic collection matching to support better validation.
Added additional collection support.