Improve unique method