Pull in edits to allow getData to take an array