Renamed collections to containers
Added support for wstring and wchar in comparisons