Use Dict instead of List for easy update