[refactor] Modifying handling and passing of array values.