Use Map instead of List