Switch MapList to use Java HashMap