FUL-165 - Add new feature uniqueId