Use Hash instead of Set class
Merge pull request #3250 from dereuromark/2.5-hash

Use Hash instead of Set class