Changing wpiList from array to dictionary