Added the ability to generate unique fields