Switched to using Map instead of List.