Changed the states info from a map to an array