Use new HashMap / HashSet constructor