Fixed potential stack issue, removed custom UniqueT and Unique
V0.3.1