Added uniqueness check