Added hash set
Fix memory leak