Fix Upgraded Unique bug and Added support for more strategies