Use List instead of Map