Addressing reviewers comments: change Set to Array
Merge with previous updates