Fixed UniqueID and add of multiple solutions in Setup