Added new Map collection class and reworked Set.