Avoid use of raw collection type