Added Unique to need handler system