Made uniq user generated and not internal